diff --git a/ruby.spec b/ruby.spec
index 794d9f6..a71bf5d 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -56,7 +56,7 @@ Version: %{ruby_version_patch_level}
 # we cannot reset the release number to 1 even when the main (ruby) version
 # is updated - because it may be that the versions of sub-components don't
 # change.
-Release: 16%{?dist}
+Release: 17%{?dist}
 Group: Development/Languages
 # Public Domain for example for: include/ruby/st.h, strftime.c, ...
 License: (Ruby or BSD) and Public Domain
@@ -211,16 +211,26 @@ Provides:   ri = %{version}-%{release}
 Provides:   rubygem(rdoc) = %{version}-%{release}
 Obsoletes:  ruby-rdoc < %{version}
 Obsoletes:  ruby-ri < %{version}
+BuildArch:  noarch
+
+%description -n rubygem-rdoc
+RDoc produces HTML and command-line documentation for Ruby projects.  RDoc
+includes the 'rdoc' and 'ri' tools for generating and displaying online
+documentation.
+
+
+%package doc
+Summary:    Documentation for %{name}
+Group:      Documentation
+Requires:   %{_bindir}/ri
 # TODO: It seems that ri documentation differs from platform to platform due to
 # some encoding bugs, therefore the documentation should be split out of this gem
 # or kept platform specific.
 # https://github.com/rdoc/rdoc/issues/71
 # BuildArch:  noarch
 
-%description -n rubygem-rdoc
-RDoc produces HTML and command-line documentation for Ruby projects.  RDoc
-includes the 'rdoc' and 'ri' tools for generating and displaying online
-documentation.
+%description doc
+This package contains documentation for %{name}.
 
 
 %package -n rubygem-bigdecimal
@@ -465,15 +475,8 @@ make check TESTS="-v $DISABLE_TESTS"
 %files
 %doc COPYING
 %lang(ja) %doc COPYING.ja
-%doc ChangeLog
 %doc GPL
 %doc LEGAL
-%doc NEWS
-%doc README
-%lang(ja) %doc README.ja
-%doc ToDo
-%doc doc/ChangeLog-*
-%doc doc/NEWS-*
 %{_bindir}/erb
 %{_bindir}/ruby
 %{_bindir}/testrb
@@ -691,6 +694,14 @@ make check TESTS="-v $DISABLE_TESTS"
 %{gem_dir}/gems/rdoc-%{rdoc_version}
 %{gem_dir}/specifications/rdoc-%{rdoc_version}.gemspec
 %{_mandir}/man1/ri*
+
+%files doc
+%doc NEWS
+%doc README
+%lang(ja) %doc README.ja
+%doc ChangeLog
+%doc doc/ChangeLog-*
+%doc doc/NEWS-*
 %{_datadir}/ri
 
 %files -n rubygem-bigdecimal
@@ -726,6 +737,9 @@ make check TESTS="-v $DISABLE_TESTS"
 %{ruby_libdir}/tkextlib
 
 %changelog
+* Thu Sep 06 2012 Vít Ondruch <vondruch@redhat.com> - 1.9.3.194-17
+- Split documentation into -doc subpackage.
+
 * Tue Aug 14 2012 Vít Ondruch <vondruch@redhat.com> - 1.9.3.194-16
 - Revert the dependency of ruby-libs on rubygems (rhbz#845011, rhbz#847482).