diff --git a/cairomm.spec b/cairomm.spec
index 111647b..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.4
-Release:          1%{?dist}
+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
@@ -61,6 +66,13 @@ hierarchy and can be found at /usr/share/doc/cairomm-1.0
 %{__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
 
@@ -79,14 +91,19 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 %{_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}/doc/cairomm-1.0/
-%doc %{_datadir}/devhelp/books/cairomm-1.0/cairomm-1.0.devhelp2
+%doc %{_datadir}/gtk-doc/html/cairomm-%{apiver}/
 
 %changelog
+* 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