diff --git a/rubygem-gdk3.spec b/rubygem-gdk3.spec
index 8e78716..00fb708 100644
--- a/rubygem-gdk3.spec
+++ b/rubygem-gdk3.spec
@@ -6,7 +6,7 @@
 Summary:	Ruby binding of GDK-3.x
 Name:		rubygem-%{gem_name}
 Version:	2.2.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Group:		Development/Languages
 # Various files in gem
@@ -22,10 +22,6 @@ Requires:	ruby
 BuildRequires:	ruby
 
 Requires:	ruby(rubygems) 
-Requires:	rubygem(glib2) >= %{glib_min_ver}
-Requires:	rubygem(atk)
-Requires:	rubygem(pango)
-Requires:	rubygem(gdk_pixbuf2)
 BuildRequires:	ruby-devel
 BuildRequires:	rubygems-devel
 BuildRequires:	rubygem-glib2-devel >= %{glib_min_ver}
@@ -102,15 +98,16 @@ cp -a .%{gem_dir}/* \
 	%{buildroot}%{gem_dir}/
 
 # move header files, C extension files to the correct directory
-pushd %{buildroot}
+mkdir -p %{buildroot}%{gem_extdir_mri}
+cp -a ./%{gem_extdir_mri}/* %{buildroot}%{gem_extdir_mri}/
 
+pushd %{buildroot}
 mkdir -p .%{header_dir}
-mv .%{gem_instdir}/lib/*.h .%{header_dir}/
-
-mkdir -p .%{gem_extdir_mri}/lib
-mv .%{gem_instdir}/lib/%{gem_name}.so .%{gem_extdir_mri}/lib/
+mv .%{gem_extdir_mri}/*.h .%{header_dir}/
+rm -f .%{gem_extdir_mri}/{gem_make.out,mkmf.log}
 popd
 
+
 # move pkgconfig file
 mkdir %{buildroot}%{_libdir}/pkgconfig
 install -cpm 644 ./%{_libdir}/pkgconfig/*.pc \
@@ -133,7 +130,7 @@ ln -sf /bin/true make
 export PATH=$(pwd):$PATH
 popd
 
-ruby -Ilib:test ./test/run-test.rb
+ruby -Ilib:test:ext/%{gem_name} ./test/run-test.rb
 
 popd
 
@@ -147,9 +144,7 @@ popd
 %dir	%{gem_instdir}/lib/%{gem_name}/
 %{gem_instdir}/lib/%{gem_name}/*.rb
 
-%dir	%{gem_extdir_mri}/
-%dir	%{gem_extdir_mri}/lib/
-%{gem_extdir_mri}/lib/%{gem_name}.so
+%{gem_extdir_mri}/
 
 %exclude %{gem_cache}
 %{gem_spec}
@@ -164,6 +159,9 @@ popd
 %exclude	%{gem_instdir}/test/
 
 %changelog
+* Thu Apr 17 2014 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.2.0-2
+- F-21: rebuild for ruby 2.1 / rubygems 2.2
+
 * Mon Apr 14 2014 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.2.0-1
 - 2.2.0