diff --git a/rubygem-marc.spec b/rubygem-marc.spec
index 511515f..54a5a3e 100644
--- a/rubygem-marc.spec
+++ b/rubygem-marc.spec
@@ -1,27 +1,28 @@
-%{!?ruby_sitelib:	%global ruby_sitelib	%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
+%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		gemdir		%(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%global		gemname	marc
-%global		geminstdir	%{gemdir}/gems/%{gemname}-%{version}
+%global		gem_name	marc
 
-%global		rubyabi		1.8
-
-Name:		rubygem-%{gemname}
+Name:		rubygem-%{gem_name}
 Version:	0.4.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Ruby library for MARC catalog
 Group:		Development/Languages
 
 License:	MIT
 URL:		http://marc.rubyforge.org/
-Source0:	http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
+Source0:	http://gems.rubyforge.org/gems/%{gem_name}-%{version}.gem
 
 BuildRequires:	ruby(abi) = %{rubyabi}
-BuildRequires:	ruby(rubygems)
+BuildRequires:	rubygems-devel
 BuildRequires:	rubygem(rake)
 Requires:	ruby(abi) = %{rubyabi}
 Requires:	ruby(rubygems)
-Provides:	rubygem(%{gemname}) = %{version}-%{release}
+Provides:	rubygem(%{gem_name}) = %{version}-%{release}
 
 BuildArch:	noarch
 
@@ -37,43 +38,43 @@ Requires:	%{name} = %{version}-%{release}
 %description	doc
 This package contains documentation for %{name}.
 
-%package -n	ruby-%{gemname}
-Summary:	Non-Gem support package for %{gemname}
+%package -n	ruby-%{gem_name}
+Summary:	Non-Gem support package 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 
 %setup -q -T -c
 
-mkdir -p .%{gemdir}
+mkdir -p .%{gem_dir}
 gem install \
 	--local \
-	--install-dir .%{gemdir} \
+	--install-dir .%{gem_dir} \
 	--force \
 	--rdoc \
 	-V \
 	%{SOURCE0}
 
-find .%{geminstdir}/{lib,test} -name \*.rb -print0 | xargs -0 chmod 0644
-find .%{geminstdir}/{lib,test} -name \*.rb -print0 | \
+find .%{gem_instdir}/{lib,test} -name \*.rb -print0 | xargs -0 chmod 0644
+find .%{gem_instdir}/{lib,test} -name \*.rb -print0 | \
 	xargs -0 grep -l --null '#![ \t]*%{_bindir}' | \
 	xargs -0 chmod 0755
 
 %build
 
 %install
-mkdir -p %{buildroot}%{gemdir}
+mkdir -p %{buildroot}%{gem_dir}
 
-cp -a .%{gemdir}/* %{buildroot}%{gemdir}/
+cp -a .%{gem_dir}/* %{buildroot}%{gem_dir}/
 
 # Create symlinks
 ##
-## Note that before switching to gem %%{ruby_sitelib}/%%{gemname}
+## Note that before switching to gem %%{ruby_sitelib}/%%{gem_name}
 ## already existed as a directory, so this cannot be replaced
 ## by symlink (cpio fails)
 ## Similarly, all directories under %%{ruby_sitelib} cannot be
@@ -127,37 +128,44 @@ 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}
 # test_xml in tc_record.rb sometimes fails, need investigating
 rake test || echo "Investigate this later"
 
 %files
 %defattr(-,root,root,-)
 
-%dir %{geminstdir}/
-%doc %{geminstdir}/[A-Z]*
-%exclude %{geminstdir}/Rakefile
-%{geminstdir}/lib/
+%dir %{gem_instdir}/
+%doc %{gem_instdir}/[A-Z]*
+%exclude %{gem_instdir}/Rakefile
+%{gem_instdir}/lib/
 
-%{gemdir}/cache/%{gemname}-%{version}.gem
-%{gemdir}/specifications/%{gemname}-%{version}.gemspec
+%{gem_cache}
+%{gem_spec}
 
 %files		doc
 %defattr(-,root,root,-)
-%{geminstdir}/Rakefile
-%{gemdir}/doc/%{gemname}-%{version}/
-%{geminstdir}/test/
+%{gem_instdir}/Rakefile
+%{gem_dir}/doc/%{gem_name}-%{version}/
+%{gem_instdir}/test/
 
-%files -n	ruby-%{gemname}
+%if %{?fedora} < 17
+%files -n	ruby-%{gem_name}
 %defattr(-,root,root,-)
-%{ruby_sitelib}/%{gemname}.rb
-%{ruby_sitelib}/%{gemname}/
+%{ruby_sitelib}/%{gem_name}.rb
+%{ruby_sitelib}/%{gem_name}/
+%endif
 
 
 %changelog
+* Sun Feb  5 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 0.4.3-3
+- F-17: rebuild against ruby19
+
 * Sun Jan 15 2012 Mamoru Tasaka <mtasaka@fedoraproject.org>
 - Rescue test result for now
 
@@ -187,7 +195,7 @@ rake test || echo "Investigate this later"
 
 * Mon Nov 23 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.3.0-2
 - Fix Summary
-- Surely create .%%{gemdir} before installing gem file
+- Surely create .%%{gem_dir} before installing gem file
 
 * Fri Nov 20 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.3.0-1
 - Switch to gem