diff --git a/rubygem-htmlentities.spec b/rubygem-htmlentities.spec
index f40913c..73f3df2 100644
--- a/rubygem-htmlentities.spec
+++ b/rubygem-htmlentities.spec
@@ -1,54 +1,69 @@
 # Generated from htmlentities-4.0.0.gem by gem2rpm -*- rpm-spec -*-
-%global	ruby_sitelib		%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
-
-%global	gemdir			%(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%global	gemname		htmlentities
-%global	geminstdir		%{gemdir}/gems/%{gemname}-%{version}
-
+%if 0%{?fedora} >= 17
+%global	rubyabi		1.9.1
+%else
 %global	rubyabi		1.8
+%global	ruby_sitelib            %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
+%endif
+
+%global	gem_name		htmlentities
 
 # Some functions removed on 4.2.4. Please don't upgrade this rpm
 # to 4.3.0+ on F-14-
 
 Summary:	A module for encoding and decoding (X)HTML entities
-Name:		rubygem-%{gemname}
+Name:		rubygem-%{gem_name}
 Version:	4.3.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Group:		Development/Languages
 License:	MIT
 URL:		http://htmlentities.rubyforge.org/
-Source0:	http://rubygems.org/gems/%{gemname}-%{version}.gem
+Source0:	http://rubygems.org/gems/%{gem_name}-%{version}.gem
 
 BuildRequires:	ruby(abi) = %{rubyabi}
 BuildRequires:	ruby(rubygems)
 Requires:	ruby(abi) = %{rubyabi}
 Requires:	ruby(rubygems)
 BuildArch:	noarch
-Provides:	rubygem(%{gemname}) = %{version}-%{release}
+Provides:	rubygem(%{gem_name}) = %{version}-%{release}
+%if 0%{?fedora} >= 17
+Obsoletes:	ruby-%{gem_name} <= %{version}-%{release}
+Provides:	ruby-%{gem_name} = %{version}-%{release}
+%endif
 
 %description
 HTMLEntities is a simple library to facilitate encoding and 
 decoding of named (&yacute; and so on) or numerical (&#123; or &#x12a;) 
 entities in HTML and XHTML documents.
 
-%package	-n ruby-%{gemname}
-Summary:	Non-Gem support for %{gemname}
+%package	doc
+Summary:	Documentation for %{name}
+Group:		Documentation
+# Directory ownership issue
+Requires:	%{name} = %{version}-%{release}
+Requires:	ruby(rubygems)
+
+%description	doc
+This package contains documentation for %{name}.
+
+%package	-n ruby-%{gem_name}
+Summary:	Non-Gem support for %{gem_name}
 Group:		Development/Languages
 Requires:	%{name} = %{version}-%{release}
-Provides:	ruby(%{gemname}) = %{version}-%{release}
+Provides:	ruby(%{gem_name}) = %{version}-%{release}
 
-%description	-n ruby-%{gemname}
-This package provides non-Gem support for %{gemname}.
+%description	-n ruby-%{gem_name}
+This package provides non-Gem support for %{gem_name}.
 
 %prep
 # First install rubygems under %%_builddir to execute some
 # tests
 %setup -q -c -T
 
-mkdir -p ./%{geminstdir}
+mkdir -p ./%{gem_instdir}
 gem install \
 	-V \
-	--local --install-dir ./%{gemdir} \
+	--local --install-dir ./%{gem_dir} \
 	--force \
 	--rdoc \
 	%{SOURCE0}
@@ -57,13 +72,13 @@ gem install \
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}%{gemdir}
-cp -a ./%{gemdir}/* %{buildroot}%{gemdir}/
+mkdir -p %{buildroot}%{gem_dir}
+cp -a ./%{gem_dir}/* %{buildroot}%{gem_dir}/
 
 # Cleanups
-rm -f %{buildroot}%{geminstdir}/setup.rb
+rm -f %{buildroot}%{gem_instdir}/setup.rb
 
-# Create symlinks for ruby-%%{gemname}
+# Create symlinks for ruby-%%{gem_name}
 # Copied from rubygem-gettext.spec
 
 create_symlink_rec(){
@@ -113,36 +128,41 @@ popd
 
 }
 
-create_symlink_rec %{geminstdir}/lib %{ruby_sitelib}
-
+%if 0%{?fedora} >= 17
+create_symlink_rec %{gem_instdir}/lib %{ruby_sitelib}
+%endif
 
 %check
-pushd ./%{geminstdir}/
+pushd ./%{gem_instdir}/
 for f in test/*.rb
 do
 	ruby -Ilib $f
 done
 
 %files
-%defattr(-,root,root,-)
-%doc	%{gemdir}/doc/%{gemname}-%{version}/
+%dir	%{gem_instdir}
+%doc	%{gem_instdir}/[A-Z]*
+%{gem_instdir}/lib/
 
-%dir	%{geminstdir}
-%doc	%{geminstdir}/[A-Z]*
-%{geminstdir}/lib/
-%doc	%{geminstdir}/perf/
-%doc	%{geminstdir}/test/
+%{gem_cache}
+%{gem_spec}
 
-%{gemdir}/cache/%{gemname}-%{version}.gem
-%{gemdir}/specifications/%{gemname}-%{version}.gemspec
+%if %{?fedora} < 17
+%files	-n ruby-%{gem_name}
+%{ruby_sitelib}/%{gem_name}.rb
+%{ruby_sitelib}/%{gem_name}/
+%endif
 
-%files	-n ruby-%{gemname}
-%defattr(-,root,root,-)
-%{ruby_sitelib}/%{gemname}.rb
-%{ruby_sitelib}/%{gemname}/
+%files	doc
+%{gem_instdir}/perf/
+%{gem_instdir}/test/
+%{gem_docdir}/
 
 
 %changelog
+* Sun Feb  5 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 4.3.1-3
+- F-17: rebuild against ruby19
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.3.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild