diff --git a/.cvsignore b/.cvsignore
index 3e691a4..e5e00bd 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libsoup-1.99.28.tar.bz2
+libsoup-2.1.9.tar.bz2
diff --git a/libsoup.spec b/libsoup.spec
index 166cdf5..61f447b 100644
--- a/libsoup.spec
+++ b/libsoup.spec
@@ -1,6 +1,6 @@
 Summary: Soup, an HTTP library implementation
 Name: libsoup
-Version: 1.99.28
+Version: 2.1.9
 Release: 1
 License: LGPL
 Group: Development/Libraries
@@ -8,7 +8,7 @@ Source0: ftp://ftp.gnome.org/pub/gnome/sources/libsoup/1.99/%{name}-%{version}.t
 URL:  ftp://ftp.gnome.org/pub/gnome/sources/libsoup/
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: glib2 >= 2.0
-BuildRequires: glib2-devel, openssl-devel, pkgconfig
+BuildRequires: glib2-devel, pkgconfig, gtk-doc
 
 %description
 Libsoup is an HTTP library implementation in C. It was originally part
@@ -34,11 +34,6 @@ you to develop applications that use the libsoup library.
 %setup -q
 
 %build
-if pkg-config openssl ; then
-	export CFLAGS="$RPM_OPT_FLAGS `pkg-config --cflags openssl`"
-	export CPPFLAGS="$RPM_OPT_FLAGS `pkg-config --cflags openssl`"
-	export LDFLAGS=`pkg-config --libs-only-L openssl`
-fi
 %configure
 make
 
@@ -59,24 +54,39 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root)
 %doc README COPYING ChangeLog NEWS TODO AUTHORS INSTALL 
 %{_libdir}/lib*.so.*
-%{_libexecdir}/libsoup-ssl-proxy
 
 %files devel
 %defattr(-, root, root)
-%{_includedir}/soup-2.0
+%{_includedir}/libsoup-2.2
 %{_libdir}/*.a
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
+%{_datadir}/gtk-doc/html/libsoup
 
 %changelog
-* Mon Mar 15 2004 Jeremy Katz <katzj@redhat.com> 1.99.28-1
-- update to 1.99.28
+* Tue Apr 20 2004 David Malcolm <dmalcolm@redhat.com> - 2.1.9-1
+- Update to 2.1.9; added gtk-doc to BuildRequires and the generated files to the devel package
 
-* Wed Mar 10 2004 Jeremy Katz <katzj@redhat.com> 1.99.26-4
-- rebuild
+* Wed Mar 10 2004 Jeremy Katz <katzj@redhat.com> - 2.1.8-1
+- 2.1.8
 
-* Thu Feb 19 2004 Jeremy Katz <katzj@redhat.com> - 1.99.26-3
-- rebuild
+* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Tue Feb 17 2004 Jeremy Katz <katzj@redhat.com> - 2.1.7-1
+- 2.1.7
+
+* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Mon Jan 26 2004 Jeremy Katz <katzj@redhat.com> 2.1.5-1
+- 2.1.5
+
+* Wed Jan 14 2004 Jeremy Katz <katzj@redhat.com> 2.1.4-0
+- update to 2.1.4
+
+* Sat Jan  3 2004 Jeremy Katz <katzj@redhat.com> 2.1.3-0
+- update to 2.1.3
 
 * Tue Sep 23 2003 Jeremy Katz <katzj@redhat.com> 1.99.26-2
 - rebuild
diff --git a/sources b/sources
index 4be066e..a8da26a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c33f1cb5697ef9b9ad6cd8482c4c2abb  libsoup-1.99.28.tar.bz2
+24f38def1fa0825d41691e4a2e91e098  libsoup-2.1.9.tar.bz2