diff --git a/xmms2-0.8DrO_o-ruby22-remove-deprecated-usage.patch b/xmms2-0.8DrO_o-ruby22-remove-deprecated-usage.patch
new file mode 100644
index 0000000..611a22e
--- /dev/null
+++ b/xmms2-0.8DrO_o-ruby22-remove-deprecated-usage.patch
@@ -0,0 +1,11 @@
+--- xmms2-0.8DrO_o/.waf-1.6.7-b271784c448ab906d5606267fb7f92c0/waflib/Tools/ruby.py.rbconfig	2015-01-16 17:04:41.900715116 +0900
++++ xmms2-0.8DrO_o/.waf-1.6.7-b271784c448ab906d5606267fb7f92c0/waflib/Tools/ruby.py	2015-01-16 17:18:02.144349327 +0900
+@@ -45,7 +45,7 @@
+ 	def read_out(cmd):
+ 		return Utils.to_list(self.cmd_and_log([self.env.RUBY,'-rrbconfig','-e',cmd]))
+ 	def read_config(key):
+-		return read_out('puts Config::CONFIG[%r]'%key)
++		return read_out('puts RbConfig::CONFIG[%r]'%key)
+ 	ruby=self.env['RUBY']
+ 	archdir=read_config('archdir')
+ 	cpppath=archdir
diff --git a/xmms2.spec b/xmms2.spec
index 3fa6021..c285274 100644
--- a/xmms2.spec
+++ b/xmms2.spec
@@ -5,7 +5,7 @@
 Name:			xmms2
 Summary: 		A modular audio framework and plugin architecture
 Version:		0.8
-Release:		22%{?dist}
+Release:		23%{?dist}
 License:		LGPLv2+ and GPLv2+ and BSD
 Group:			Applications/Multimedia
 # We can't use the upstream source tarball as-is, because it includes an mp4 decoder.
@@ -27,6 +27,8 @@ Patch6:			xmms2-0.8DrO_o-xsubpp-fix.patch
 Patch7:			xmms2-0.8DrO_o-libmodplug-pkgconfig-change.patch
 # libvorbis 1.3.4 changed pkgconfig libs output
 Patch8:			xmms2-0.8DrO_o-vorbis-pkgconfig-libs.patch
+# Remove deprecated usage on ruby 22
+Patch9:			xmms2-0.8DrO_o-ruby22-remove-deprecated-usage.patch
 URL:			http://wiki.xmms2.xmms.se/
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:		sqlite-devel, flac-devel, libofa-devel
@@ -135,8 +137,14 @@ export CPPFLAGS="%{optflags}"
 export LIBDIR="%{_libdir}"
 export PYTHONDIR="%{python_sitearch}"
 export XSUBPP="%{_bindir}/xsubpp"
+# Now with ruby22, the following waf fails until applying PATCH9
+# Really want to know how to patch against waf beforehand...
 ./waf configure --prefix=%{_prefix} --libdir=%{_libdir} --with-ruby-libdir=%{ruby_vendorlibdir} --with-ruby-archdir=%{ruby_vendorarchdir} \
-  --with-perl-archdir=%{perl_archlib} --with-pkgconfigdir=%{_libdir}/pkgconfig -j1
+  --with-perl-archdir=%{perl_archlib} --with-pkgconfigdir=%{_libdir}/pkgconfig -j1 || true
+(
+	cd .waf-1.*
+	cat %PATCH9 | patch -p2
+)
 # Hacky, hacky, hacky.
 patch -p0 < %{_sourcedir}/xmms2-0.8DrO_o-xsubpp-fix.patch
 ./waf configure --prefix=%{_prefix} --libdir=%{_libdir} --with-ruby-libdir=%{ruby_vendorlibdir} --with-ruby-archdir=%{ruby_vendorarchdir} \
@@ -216,6 +224,10 @@ rm -rf %{buildroot}
 %{_bindir}/nyxmms2
 
 %changelog
+* Fri Jan 16 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.8-23
+- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_2.2
+- Remove deprecated Config:: usage, do some trick on waf
+
 * Tue Nov 11 2014 Adrian Reber <adrian@lisas.de> - 0.8-22
 - Rebuilt for libcdio-0.93