diff --git a/tevent.changes b/tevent.changes
index 2ca0d22..b429d43 100644
--- a/tevent.changes
+++ b/tevent.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 23 20:41:59 UTC 2014 - lmuelle@suse.com
+
+- Utilize doxygen to generate the API documentation and package it.
+
 -------------------------------------------------------------------
 Mon Feb 17 22:00:55 UTC 2014 - lmuelle@suse.com
 
diff --git a/tevent.spec b/tevent.spec
index faa5d41..f49cae7 100644
--- a/tevent.spec
+++ b/tevent.spec
@@ -138,11 +138,19 @@ CONFIGURE_OPTIONS="\
 %{__make} %{build_make_smp_mflags} \
 	all
 
+doxygen doxy.config
+
 %check
 %{__make} test
 
 %install
 DESTDIR=${RPM_BUILD_ROOT} make install
+
+# install API docs
+mkdir -p $RPM_BUILD_ROOT/%{_mandir}
+cp -a doc/man/* $RPM_BUILD_ROOT/%{_mandir}
+rm $RPM_BUILD_ROOT/%{_mandir}/man3/todo.3
+
 # Shared libraries need to be marked executable for rpmbuild to strip them and
 # include them in debuginfo
 find ${RPM_BUILD_ROOT} -name "*.so*" -exec chmod -c +x {} \;
@@ -164,6 +172,7 @@ find ${RPM_BUILD_ROOT} -name "*.so*" -exec chmod -c +x {} \;
 %{_includedir}/tevent.h
 %{_libdir}/libtevent.so
 %{_libdir}/pkgconfig/tevent.pc
+%{_mandir}/man3/tevent*.*
 
 %files -n python-tevent
 %defattr(-,root,root)