diff --git a/.cvsignore b/.cvsignore
index 6f20d93..9369be5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-cairomm-1.8.2.tar.gz
+cairomm-1.8.4.tar.gz
diff --git a/cairomm.spec b/cairomm.spec
index 042aab9..a409cf4 100644
--- a/cairomm.spec
+++ b/cairomm.spec
@@ -1,13 +1,17 @@
+%global apiver 1.0
+%define cairover 1.8.0
+
 Summary:          C++ API for the cairo graphics library
 Name:             cairomm
-Version:          1.8.2
-Release:          1%{?dist}
+Version:          1.8.4
+Release:          2%{?dist}
 URL:              http://www.cairographics.org
 License:          LGPLv2+
 Group:            System Environment/Libraries
 Source:           http://www.cairographics.org/releases/%{name}-%{version}.tar.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:    cairo-devel >= 1.5.10 pkgconfig
+BuildRequires:    cairo-devel >= %{cairover}
+BuildRequires:    pkgconfig
 BuildRequires:    libsigc++20-devel
 
 %description
@@ -19,7 +23,8 @@ Standard Template Library where it makes sense.
 Summary:        Headers for developing programs that will use %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       cairo-devel >= 1.4.0 pkgconfig
+Requires:       cairo-devel >= %{cairover}
+Requires:       pkgconfig
 Requires:       libsigc++20-devel
 
 %description    devel
@@ -30,11 +35,30 @@ Standard Template Library where it makes sense.
 This package contains the libraries and header files needed for
 developing %{name} applications.
 
+%package          doc
+Summary:          Developer's documentation for the cairomm library
+Group:            Documentation
+Requires:         gtk-doc
+Requires:         devhelp
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
+BuildArch:        noarch
+%endif
+
+%description      doc
+This package contains developer's documentation for the cairomm
+library. Cairomm is the C++ API for the cairo graphics library.
+
+The documentation can be viewed either through the devhelp
+documentation browser or through a web browser.
+
+If using a web browser the documentation is installed in the gtk-doc
+hierarchy and can be found at /usr/share/doc/cairomm-1.0
+
 %prep
 %setup -q 
 
 %build
-%configure --enable-static=no --enable-docs=no
+%configure --enable-static=no
 %{__make} %{?_smp_mflags}
 
 %install
@@ -42,6 +66,13 @@ developing %{name} applications.
 %{__make} install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
+# Fix documentation installation, put everything under gtk-doc
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/cairomm-%{apiver}
+mv $RPM_BUILD_ROOT%{_docdir}/cairomm-%{apiver}/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/cairomm-%{apiver}/
+mv $RPM_BUILD_ROOT%{_datadir}/devhelp/books/cairomm-%{apiver}/*.devhelp2 $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/cairomm-%{apiver}
+# Fix devhelp broken base tag
+sed -i 's:base="[^\"]*":base="%{_datadir}/gtk-doc/html/cairomm-%{apiver}/reference/html":' $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/cairomm-%{apiver}/*.devhelp2
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -58,12 +89,25 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 %defattr(-,root,root,-)
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
+%{_libdir}/cairomm-1.0/include/cairommconfig.h
 %{_includedir}/cairomm-1.0/
-%doc ChangeLog docs/reference
+%doc ChangeLog
+
+%files doc
+%defattr(-,root,root,-)
+%doc %{_datadir}/gtk-doc/html/cairomm-%{apiver}/
 
 %changelog
-* Wed Sep 30 2009 Rick L Vinyard Jr <rvinyard@cs.nmsu.edu> - 1.8.2-1
+* Wed Jul 14 2010 Rick L Vinyard Jr <rvinyard@cs.nmsu.edu> - 1.8.4-2
+- Removed html docs from -devel package
+- Seperated requires into one per line
+- Fixed devhelp docs
+- Fixed cairo version requirement
+
+* Tue Nov 17 2009 Rick L Vinyard Jr <rvinyard@cs.nmsu.edu> - 1.8.4-1
 - New upstream release
+- Added cairommconfig.h file
+- Added doc subpackage
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
diff --git a/sources b/sources
index d721e37..256fb3e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-24aa46a4f92bdb2af7cd80e6b335f07f  cairomm-1.8.2.tar.gz
+559afbc47484ba3fad265e38a3dafe90  cairomm-1.8.4.tar.gz