diff --git a/cluttermm.spec b/cluttermm.spec
index 52df21f..59ddf62 100644
--- a/cluttermm.spec
+++ b/cluttermm.spec
@@ -22,18 +22,25 @@ fast, visually rich graphical user interfaces.
 %package	devel
 Summary:	Development files for %{name}
 Group:		Development/Libraries
-
-Requires:	devhelp
 Requires:	%{name} = %{version}-%{release}
 
 %description devel
 This package contains development files for %{name}.
 
+%package	doc
+Summary:	API documentation for %{name}
+Group:		Documentation
+BuildArch:	noarch
+Requires:	%{name} = %{version}-%{release}
+
+%description doc
+This package contains the full API documentation for %{name}.
+
 %prep
 %setup -q
 
 %build
-%configure --disable-silent-rules --docdir=%{_docdir}/%{name}-%{version}
+%configure --disable-silent-rules
 
 # Omit unused direct shared library dependencies.
 sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool
@@ -44,11 +51,6 @@ make %{?_smp_mflags}
 make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -delete
 
-mv $RPM_BUILD_ROOT%{_docdir}/%{name}-1.0/reference .
-pushd $RPM_BUILD_ROOT%{_docdir}/%{name}-1.0
-  ln -s ../%{name}-devel-%{version}/reference reference
-popd
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -63,19 +65,20 @@ popd
 %doc examples/actor.png
 %doc examples/test-actors.cc
 %doc examples/test-boxes.cc
-%doc reference
-%doc %{_docdir}/%{name}-1.0
-
 %{_libdir}/libcluttermm-1.0.so
 %{_libdir}/pkgconfig/%{name}-1.0.pc
 %{_libdir}/%{name}-1.0
-%{_datadir}/devhelp/books/%{name}-1.0
 %{_datadir}/%{name}-1.0
 %{_includedir}/%{name}-1.0
 
+%files doc
+%doc %{_docdir}/cluttermm-1.0/
+%doc %{_datadir}/devhelp/
+
 %changelog
 * Tue Apr 15 2014 Kalev Lember <kalevlember@gmail.com> - 1.17.2-1
 - Update to 1.17.2
+- Split out a noarch -doc subpackage, similar to other *mm packages
 
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild