diff --git a/.gitignore b/.gitignore
index 766f92b..338fd97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/qtruby-4.7.4.tar.bz2
+/qtruby-4.8.1.tar.xz
diff --git a/ruby-qt.spec b/ruby-qt.spec
index e02e364..745fbee 100644
--- a/ruby-qt.spec
+++ b/ruby-qt.spec
@@ -1,16 +1,26 @@
-%global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
-%global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')
+%if 0%{?fedora} > 16
+%global ruby_abi 1.9.1
+%else
+%global ruby_abi 1.8
+%global ruby_vendorlibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
+%global ruby_vendorarchdir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')
+%endif
 
 Summary: Ruby bindings for Qt 4
 Name:    ruby-qt
-Version: 4.7.4
+Version: 4.8.1
 Release: 1%{?dist}
 
 License: LGPLv2+
 Group:   Development/Languages
 URL:     https://projects.kde.org/projects/kde/kdebindings/ruby/qtruby
-Source:  ftp://ftp.kde.org/pub/kde/stable/%{version}/src/qtruby-%{version}.tar.bz2
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+%global revision %(echo %{version} | cut -d. -f3)
+%if %{revision} >= 50
+%global stable unstable
+%else
+%global stable stable
+%endif
+Source0: http://download.kde.org/%{stable}/%{version}/src/qtruby-%{version}.tar.xz
 
 BuildRequires: cmake
 BuildRequires: pkgconfig(phonon)
@@ -29,7 +39,7 @@ Provides: ruby(qt) = %{version}
 Provides: qtruby = %{version}-%{release}
 Provides: qtruby%{?_isa} = %{version}-%{release}
 
-Requires: ruby(abi) = 1.8
+%{?ruby_abi:Requires: ruby(abi) = %{ruby_abi}}
 %{?_qt4:Requires: qt4%{?_isa} >= %{_qt4_version}}
 Requires: smokeqt%{?_isa} >= %{version}
 
@@ -63,9 +73,12 @@ Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
  
 
 %build
+# just a cosmetic change for cmake defs
+sed -i -e 's|SITEARCH|VENDORARCH|' -e 's|SITELIB|VENDORLIB|' CMakeLists.txt
+
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kde4} -DRUBY_VENDORARCH_DIR=%{ruby_vendorarchdir} -DRUBY_VENDORLIB_DIR=%{ruby_vendorlibdir} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -87,17 +100,17 @@ rm -rf %{buildroot}
 %defattr(-, root, root, 0755)
 %doc AUTHORS COPYING COPYING.LIB ChangeLog INSTALL README
 %{_libdir}/libqtruby4shared.so.2*
-%{ruby_sitearch}/*.so
-%{ruby_sitelib}/phonon/
-%{ruby_sitelib}/qscintilla/
-%{ruby_sitelib}/qtdeclarative/
-%{ruby_sitelib}/qwt/
-%{ruby_sitelib}/Qt/
-%{ruby_sitelib}/Qt*.rb
-%{ruby_sitelib}/qtscript/
-%{ruby_sitelib}/qttest/
-%{ruby_sitelib}/qtuitools/
-%{ruby_sitelib}/qtwebkit/
+%{ruby_vendorarchdir}/*.so
+%{ruby_vendorlibdir}/phonon/
+%{ruby_vendorlibdir}/qscintilla/
+%{ruby_vendorlibdir}/qtdeclarative/
+%{ruby_vendorlibdir}/qwt/
+%{ruby_vendorlibdir}/Qt/
+%{ruby_vendorlibdir}/Qt*.rb
+%{ruby_vendorlibdir}/qtscript/
+%{ruby_vendorlibdir}/qttest/
+%{ruby_vendorlibdir}/qtuitools/
+%{ruby_vendorlibdir}/qtwebkit/
 
 %files devel
 %defattr(-, root, root, 0755)
@@ -114,10 +127,30 @@ rm -rf %{buildroot}
 %doc examples
 
 
-%changelog 
-* Tue Jan 17 2012 Rex Dieter <rdieter@fedoraproject.org> 4.7.4-1
-- 4.7.4
-- sync packaging improvements from master/ branch
+%changelog
+* Tue Mar 06 2012 Radek Novacek <rnovacek@redhat.com> 4.8.1-1
+- 4.8.1
+
+* Wed Feb 08 2012 Jaroslav Reznik <jreznik@redhat.com> 4.8.0-3
+- proper rebuild for ruby-1.9.x (use ruby macros for dirs)
+
+* Tue Feb 07 2012 Rex Dieter <rdieter@fedoraproject.org> 4.8.0-2
+- rebuild for ruby-1.9.x (f17)
+
+* Sun Jan 22 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.8.0-1
+- 4.8.0
+
+* Wed Jan 04 2012 Rex Dieter <rdieter@fedoraproject.org> - 4.7.97-1
+- 4.7.97
+
+* Sat Dec 24 2011 Rex Dieter <rdieter@fedoraproject.org> 4.7.95-2
+- rebuild (qscintilla)
+
+* Thu Dec 22 2011 Radek Novacek <rnovacek@redhat.com> - 4.7.95-1
+- 4.7.95
+
+* Tue Dec 20 2011 Rex Dieter <rdieter@fedoraproject.org> 4.7.90-1
+- 4.7.90
 
 * Tue Sep 06 2011 Than Ngo <than@redhat.com> - 4.7.1-1
 - 4.7.1
diff --git a/sources b/sources
index 45b216a..99ee4ba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5e618d2450e2507a6e69494b64e404c5  qtruby-4.7.4.tar.bz2
+0a9abf4fa07408d4dcab8bb8a0f9f344  qtruby-4.8.1.tar.xz