diff --git a/.cvsignore b/.cvsignore
index aa06410..e235967 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 libvorbis-1.0.1.tar.gz
+libvorbis-1.1.0.tar.gz
diff --git a/libvorbis.spec b/libvorbis.spec
index 337e033..a990b09 100644
--- a/libvorbis.spec
+++ b/libvorbis.spec
@@ -1,14 +1,13 @@
 Summary:	The Vorbis General Audio Compression Codec.
 Name:		libvorbis
-Version:	1.0.1
-Release:	5
+Version:	1.1.0
+Release:	1
 Epoch:		1
 Group:		System Environment/Libraries
 License:	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
@@ -36,7 +35,6 @@ 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
 # link to .pdf spec rather than ship redundant copy
@@ -84,6 +82,10 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed Sep 29 2004 Colin Walters <walters@redhat.com> 1:1.1.0-1
+- Update to 1.1.0
+- Remove upstreamed patch libvorbis-underquoted.patch
+
 * Wed Sep 29 2004 Warren Togami <wtogami@redhat.com> 1:1.0.1-5
 - link to .pdf spec rather than ship redundant copy
 - spec cleanups
diff --git a/sources b/sources
index 978e5b4..c581084 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 4d6726fd02ce02f6e24824e594b0949a  libvorbis-1.0.1.tar.gz
+bb764aeabde613d1a424a29b1f15e7e6  libvorbis-1.1.0.tar.gz