diff --git a/taglib.spec b/taglib.spec
index e54dcbb..17ca141 100644
--- a/taglib.spec
+++ b/taglib.spec
@@ -7,9 +7,12 @@
 %global buildtests -DBUILD_TESTS=ON
 %endif
 
+%bcond_without doc
+%global apidocdir __api-doc_fedora
+
 Name:       taglib	
 Version:    1.5
-Release:    6%{?dist}
+Release:    7%{?dist}
 Summary:    Audio Meta-Data Library
 
 Group: 	    System Environment/Libraries
@@ -43,6 +46,10 @@ BuildRequires: zlib-devel
 %if %{with tests}
 BuildRequires: cppunit-devel
 %endif
+%if %{with doc}
+BuildRequires: doxygen
+BuildRequires: graphviz
+%endif
 
 
 %description
@@ -52,11 +59,25 @@ files, Ogg Vorbis comments and ID3 tags and Vorbis comments in FLAC, MPC,
 Speex, WavPack, TrueAudio files, as well as APE Tags.
 
 
+%if %{with doc}
+%package doc
+Summary: API Documentation for %{name}
+Group: Documentation
+
+%description doc
+This is API documentation generated from the TagLib source code.
+%endif
+
+
 %package devel
 Summary: Development files for %{name} 
 Group:	 Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
+%if ! %{with doc}
+Obsoletes: %{name}-doc
+%endif
+
 %description devel
 Files needed when building software with %{name}.
 
@@ -85,6 +106,12 @@ popd
 
 make %{?_smp_mflags} -C %{_target_platform}
 
+%if %{with doc}
+cd doc
+doxygen taglib.doxygen
+cd -
+%endif
+
 
 %install
 rm -rf %{buildroot}
@@ -92,9 +119,15 @@ rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
 rm -fr examples/.deps
-rm -fr examples/Makefile*
+rm -fr examples/Makefile* examples/CMake*
 rm -f %{buildroot}%{_libdir}/lib*.la
 
+%if %{with doc}
+rm -fr %{apidocdir} ; mkdir %{apidocdir}
+cp -a doc/html doc/*.png %{apidocdir}
+ln -s html/index.html %{apidocdir}
+%endif
+
 
 %if %{with tests}
 %check
@@ -126,8 +159,17 @@ rm -rf %{buildroot}
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
 
+%if %{with doc}
+%files doc
+%defattr(-,root,root,-)
+%doc %{apidocdir}/*
+%endif
+
 
 %changelog
+* Sun Aug 23 2009 Michael Schwendt <mschwendt@fedoraproject.org> - 1.5-7
+- Build API documentation into -doc package.
+
 * Sat Aug 22 2009 Michael Schwendt <mschwendt@fedoraproject.org> - 1.5-6
 - Add %%check section and conditionally build with tests.
 - Update descriptions (and mention the additional file formats).