diff --git a/.cvsignore b/.cvsignore
index 54474d1..6cfe9ea 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-audiofile-0.2.5.tar.bz2
+audiofile-0.2.6.tar.bz2
diff --git a/audiofile-underquoted.patch b/audiofile-underquoted.patch
new file mode 100644
index 0000000..fd892a3
--- /dev/null
+++ b/audiofile-underquoted.patch
@@ -0,0 +1,11 @@
+--- audiofile-0.2.5/audiofile.m4.underquoted	2004-07-15 13:18:34.963462705 +0100
++++ audiofile-0.2.5/audiofile.m4	2004-07-15 13:18:43.976738116 +0100
+@@ -9,7 +9,7 @@
+ dnl AM_PATH_AUDIOFILE([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+ dnl Test for Audio File Library, and define AUDIOFILE_CFLAGS and AUDIOFILE_LIBS.
+ dnl
+-AC_DEFUN(AM_PATH_AUDIOFILE,
++AC_DEFUN([AM_PATH_AUDIOFILE],
+ [dnl 
+ dnl Get compiler flags and libraries from the audiofile-config script.
+ dnl
diff --git a/audiofile.spec b/audiofile.spec
index 0215321..428343e 100644
--- a/audiofile.spec
+++ b/audiofile.spec
@@ -1,17 +1,18 @@
 Summary: A library for accessing various audio file formats.
 Name: audiofile
-Version: 0.2.5
-Release: 2
+Version: 0.2.6
+Release: 1
 Epoch: 1
 License: LGPL
 Group: System Environment/Libraries
 Source: ftp://ftp.gnome.org/pub/gnome/sources/audiofile/0.2/audiofile-%{version}.tar.bz2
+Patch0: audiofile-underquoted.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /sbin/ldconfig
 
 %description
-The Audio File library is an implementation of SGI's Audio File
-Library, which provides an API for accessing audio file formats like
+The Audio File library is an implementation of the Audio File Library
+from SGI, which provides an API for accessing audio file formats like
 AIFF/AIFF-C, WAVE, and NeXT/Sun .snd/.au files. This library is used
 by the EsounD daemon.
 
@@ -30,6 +31,7 @@ other resources you can use to develop Audio File applications.
 
 %prep
 %setup -q
+%patch0 -p1 -b .underquoted
 
 %build
 %configure
@@ -69,6 +71,14 @@ rm -rf %{buildroot}
 %{_datadir}/aclocal/*
 
 %changelog
+* Thu Jul 30 2004 Colin Walters  <walters@redhat.com>
+- Update to 0.2.6
+- Rework description to not contain apostrophe that
+  makes emacs unhappy
+
+* Thu Jul 15 2004 Tim Waugh <twaugh@redhat.com>
+- Fixed warnings in shipped m4 file.
+
 * Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt
 
diff --git a/sources b/sources
index 6ed5261..c855bc5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7eb4a437851062e93f965b6c981471c4  audiofile-0.2.5.tar.bz2
+3d01302834660850b6141cac1e6f5501  audiofile-0.2.6.tar.bz2