diff --git a/libvorbis-underquoted.patch b/libvorbis-underquoted.patch
new file mode 100644
index 0000000..07cabdf
--- /dev/null
+++ b/libvorbis-underquoted.patch
@@ -0,0 +1,11 @@
+--- libvorbis-1.0.1/vorbis.m4.underquoted	2004-07-15 12:47:00.696848903 +0100
++++ libvorbis-1.0.1/vorbis.m4	2004-07-15 12:47:17.263684073 +0100
+@@ -6,7 +6,7 @@
+ dnl XIPH_PATH_VORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+ dnl Test for libvorbis, and define VORBIS_CFLAGS and VORBIS_LIBS
+ dnl
+-AC_DEFUN(XIPH_PATH_VORBIS,
++AC_DEFUN([XIPH_PATH_VORBIS],
+ [dnl 
+ dnl Get the cflags and libraries
+ dnl
diff --git a/libvorbis.spec b/libvorbis.spec
index 0ef173a..67dd87c 100644
--- a/libvorbis.spec
+++ b/libvorbis.spec
@@ -1,13 +1,14 @@
 Summary: The Vorbis General Audio Compression Codec.
 Name:		libvorbis
 Version:	1.0.1
-Release: 3
+Release: 4
 Epoch:		1
 Group: System Environment/Libraries
 Copyright:	BSD
 URL:		http://www.xiph.org/
 Source:		http://www.xiph.org/ogg/vorbis/download/%{name}-%{version}.tar.gz
 Patch:		libvorbis-1.0-m4.patch
+Patch2:		libvorbis-underquoted.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Requires:	libogg >= 2:1.1
 BuildPrereq: 	libogg-devel >= 2:1.1
@@ -35,6 +36,7 @@ needed to develop applications with Ogg Vorbis.
 
 %setup -q
 %patch -p1 -b .m4-patch
+%patch2 -p1 -b .underquoted
 perl -p -i -e "s/-O20/$RPM_OPT_FLAGS/" configure
 perl -p -i -e "s/-ffast-math//" configure
 
@@ -77,6 +79,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Jul 15 2004 Tim Waugh <twaugh@redhat.com> 1:1.0.1-4
+- Fixed warnings in shipped m4 file.
+
 * Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt