diff --git a/rubygem-i18n.changes b/rubygem-i18n.changes
index d9e1276..a5275f9 100644
--- a/rubygem-i18n.changes
+++ b/rubygem-i18n.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 10 09:23:44 UTC 2014 - fcastelli@suse.com
+
+- update to new packaging scheme and add gem2rpm.yml
+
 -------------------------------------------------------------------
 Mon Jul 28 05:28:21 UTC 2014 - coolo@suse.com
 
diff --git a/rubygem-i18n.spec b/rubygem-i18n.spec
index 2f695bf..f9996ff 100644
--- a/rubygem-i18n.spec
+++ b/rubygem-i18n.spec
@@ -21,63 +21,28 @@ Version:        0.6.11
 Release:        0
 %define mod_name i18n
 %define mod_full_name %{mod_name}-%{version}
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  ruby-macros >= 3
+BuildRequires:  %{rubygem gem2rpm}
+BuildRequires:  %{ruby}
+BuildRequires:  ruby-macros >= 5
 Url:            http://github.com/svenfuchs/i18n
 Source:         http://rubygems.org/gems/%{mod_full_name}.gem
 Summary:        New wave Internationalization support for Ruby
-License:        MIT and Ruby
+License:        MIT
 Group:          Development/Languages/Ruby
-# MANUAL License
 
 %description
 New wave Internationalization support for Ruby.
 
-%package doc
-Summary:        RDoc documentation for %{mod_name}
-Group:          Development/Languages/Ruby
-Requires:       %{name} = %{version}
-
-%description doc
-Documentation generated at gem installation time.
-Usually in RDoc and RI formats.
-
-%package testsuite
-Summary:        Test suite for %{mod_name}
-Group:          Development/Languages/Ruby
-Requires:       %{name} = %{version}
-
-%description testsuite
-Test::Unit or RSpec files, useful for developers.
-
 %prep
-#gem_unpack
-#if you need patches, apply them here and replace the # with a % sign in the surrounding lines
-#gem_build
 
 %build
 
 %install
-%gem_install -f
-mkdir -p %{buildroot}%{_docdir}/%{name}
-ln -s %{gem_base}/gems/%{mod_full_name}/MIT-LICENSE %buildroot/%{_docdir}/%{name}/MIT-LICENSE
-ln -s %{gem_base}/gems/%{mod_full_name}/README.md %buildroot/%{_docdir}/%{name}/README.md
+%gem_install \
+  --doc-files="README.md MIT-LICENSE" \
+  -f
 
-%files
-%defattr(-,root,root,-)
-%{_docdir}/%{name}
-%{gem_base}/cache/%{mod_full_name}.gem
-%{gem_base}/gems/%{mod_full_name}/
-%exclude %{gem_base}/gems/%{mod_full_name}/test
-%{gem_base}/specifications/%{mod_full_name}.gemspec
-
-%files doc
-%defattr(-,root,root,-)
-%doc %{gem_base}/doc
-
-%files testsuite
-%defattr(-,root,root,-)
-%{gem_base}/gems/%{mod_full_name}/test
+%gem_packages
 
 %changelog