diff --git a/rubygem-gem2rpm.spec b/rubygem-gem2rpm.spec
index 5d6627d..9ca5bca 100644
--- a/rubygem-gem2rpm.spec
+++ b/rubygem-gem2rpm.spec
@@ -3,11 +3,12 @@
 %define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
 %define gemname gem2rpm
 %define geminstdir %{gemdir}/gems/%{gemname}-%{version}
+%define gemdocdir %{gemdir}/doc/%{gemname}-%{version}
 
 Summary: Generate rpm specfiles from gems
 Name: rubygem-%{gemname}
 Version: 0.6.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Development/Languages
 License: GPLv2+ or Ruby
 URL: http://rubyforge.org/projects/gem2rpm/
@@ -53,9 +54,13 @@ rm -rf %{buildroot}
 %{geminstdir}/rubygem-gem2rpm.spec
 %{gemdir}/cache/%{gemname}-%{version}.gem
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
-
+%doc %{gemdocdir}/rdoc
+%doc %{gemdocdir}/ri
 
 %changelog
+* Tue Nov 24 2009 David Lutterkort <lutter@redhat.com> - 0.6.0-4
+- Add gemdocdir contents as doc
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild