diff --git a/.cvsignore b/.cvsignore
index 9b96791..b14a441 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xmms2-0.6DrMattDestruction-clean.tar.bz2
+xmms2-0.7DrNo-clean.tar.bz2
diff --git a/sources b/sources
index a037404..018af4e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2e73303e6ec81d52d8927b9023793e4c  xmms2-0.6DrMattDestruction-clean.tar.bz2
+6495a6403783f0c98300e4bcad08ac84  xmms2-0.7DrNo-clean.tar.bz2
diff --git a/xmms2-0.7DrNo-moresaneversioning.patch b/xmms2-0.7DrNo-moresaneversioning.patch
new file mode 100644
index 0000000..ce67f0e
--- /dev/null
+++ b/xmms2-0.7DrNo-moresaneversioning.patch
@@ -0,0 +1,36 @@
+diff -up xmms2-0.7DrNo/wscript.versionsanity xmms2-0.7DrNo/wscript
+--- xmms2-0.7DrNo/wscript.versionsanity	2010-04-13 17:50:25.000000000 -0400
++++ xmms2-0.7DrNo/wscript	2010-04-13 17:51:34.272674113 -0400
+@@ -23,7 +23,7 @@ import Build
+ import Configure
+ from logging import fatal, warning
+ 
+-BASEVERSION="0.7 DrNo"
++BASEVERSION="0.7"
+ APPNAME='xmms2'
+ 
+ srcdir='.'
+@@ -266,14 +266,15 @@ def configure(conf):
+ 
+     nam,changed = gittools.get_info()
+     conf.check_message("git commit id", "", True, nam)
+-    if Options.options.customversion:
+-        conf.env["VERSION"] = BASEVERSION + " (%s + %s)" % (nam, Options.options.customversion)
+-    else:
+-        dirty=""
+-        if changed:
+-            dirty="-dirty"
+-        conf.check_message("uncommitted changes", "", bool(changed))
+-        conf.env["VERSION"] = BASEVERSION + " (git commit: %s%s)" % (nam, dirty)
++    ## if Options.options.customversion:
++    ##    conf.env["VERSION"] = BASEVERSION + " (%s + %s)" % (nam, Options.options.customversion)
++    ## else:
++    ##     dirty=""
++    ##     if changed:
++    ##         dirty="-dirty"
++    ##     conf.check_message("uncommitted changes", "", bool(changed))
++    ##     conf.env["VERSION"] = BASEVERSION + " (git commit: %s%s)" % (nam, dirty)
++    conf.env["VERSION"] = BASEVERSION
+ 
+     ## conf.env["CCFLAGS"] = Utils.to_list(conf.env["CCFLAGS"]) + ['-g', '-O0']
+     for warning in ('all',
diff --git a/xmms2-0.7DrNo-no-O0.patch b/xmms2-0.7DrNo-no-O0.patch
new file mode 100644
index 0000000..5be0ecd
--- /dev/null
+++ b/xmms2-0.7DrNo-no-O0.patch
@@ -0,0 +1,21 @@
+diff -up xmms2-0.7DrNo/wscript.noO0 xmms2-0.7DrNo/wscript
+--- xmms2-0.7DrNo/wscript.noO0	2010-02-19 12:43:54.000000000 -0500
++++ xmms2-0.7DrNo/wscript	2010-04-13 17:49:15.351789069 -0400
+@@ -275,7 +275,7 @@ def configure(conf):
+         conf.check_message("uncommitted changes", "", bool(changed))
+         conf.env["VERSION"] = BASEVERSION + " (git commit: %s%s)" % (nam, dirty)
+ 
+-    conf.env["CCFLAGS"] = Utils.to_list(conf.env["CCFLAGS"]) + ['-g', '-O0']
++    ## conf.env["CCFLAGS"] = Utils.to_list(conf.env["CCFLAGS"]) + ['-g', '-O0']
+     for warning in ('all',
+                     'no-format-extra-args',
+                     'no-format-zero-length',
+@@ -295,7 +295,7 @@ def configure(conf):
+             # autogenerate uselib definitions to disable warnings
+             conf.env["CCFLAGS_NO%s" % warning.replace("-","").upper()] = ["-Wno-%s" % warning]
+ 
+-    conf.env["CXXFLAGS"] = Utils.to_list(conf.env["CXXFLAGS"]) + ['-g', '-O0']
++    ## conf.env["CXXFLAGS"] = Utils.to_list(conf.env["CXXFLAGS"]) + ['-g', '-O0']
+     conf.env['XMMS_PKGCONF_FILES'] = []
+     conf.env['XMMS_OUTPUT_PLUGINS'] = [(-1, "NONE")]
+ 
diff --git a/xmms2-0.7DrNo-use-libdir.patch b/xmms2-0.7DrNo-use-libdir.patch
new file mode 100644
index 0000000..c96003f
--- /dev/null
+++ b/xmms2-0.7DrNo-use-libdir.patch
@@ -0,0 +1,63 @@
+diff -up xmms2-0.7DrNo/src/include/xmms/wscript.plugins-use-libdir xmms2-0.7DrNo/src/include/xmms/wscript
+diff -up xmms2-0.7DrNo/wafadmin/Tools/ccroot.py.plugins-use-libdir xmms2-0.7DrNo/wafadmin/Tools/ccroot.py
+diff -up xmms2-0.7DrNo/wafadmin/Tools/gnu_dirs.py.plugins-use-libdir xmms2-0.7DrNo/wafadmin/Tools/gnu_dirs.py
+diff -up xmms2-0.7DrNo/wafadmin/Tools/libtool.py.plugins-use-libdir xmms2-0.7DrNo/wafadmin/Tools/libtool.py
+--- xmms2-0.7DrNo/wafadmin/Tools/libtool.py.plugins-use-libdir	2010-02-19 12:43:54.000000000 -0500
++++ xmms2-0.7DrNo/wafadmin/Tools/libtool.py	2010-04-13 17:45:12.718672360 -0400
+@@ -45,7 +45,7 @@ def fakelibtool_build(task):
+ 	fu("current=0\n")
+ 	fu("age=0\nrevision=0\ninstalled=yes\nshouldnotlink=no\n")
+ 	fu("dlopen=''\ndlpreopen=''\n")
+-	fu("libdir='%s/lib'\n" % env['PREFIX'])
++	fu("libdir='%s'\n" % env['LIBDIR'])
+ 	dest.close()
+ 	return 0
+ 
+@@ -71,7 +71,7 @@ def apply_link_libtool(self):
+ 		self.latask = self.create_task('fakelibtool', linktask.outputs, linktask.outputs[0].change_ext('.la'))
+ 
+ 	if self.bld.is_install:
+-		self.bld.install_files('${PREFIX}/lib', linktask.outputs[0], self.env)
++		self.bld.install_files('${LIBDIR}', linktask.outputs[0], self.env)
+ 
+ @feature("libtool")
+ @before('apply_core')
+diff -up xmms2-0.7DrNo/waftools/tool.py.plugins-use-libdir xmms2-0.7DrNo/waftools/tool.py
+--- xmms2-0.7DrNo/waftools/tool.py.plugins-use-libdir	2010-02-19 12:43:54.000000000 -0500
++++ xmms2-0.7DrNo/waftools/tool.py	2010-04-13 17:40:40.215663210 -0400
+@@ -6,5 +6,5 @@ def add_install_flag(bld, obj):
+ 
+     if env['explicit_install_name']:
+         libname = obj.env["shlib_PATTERN"] % obj.target
+-        insname = os.path.join(obj.env["PREFIX"], 'lib', libname)
++        insname = os.path.join(obj.env["LIBDIR"], libname)
+         obj.env.append_unique("LINKFLAGS", '-install_name ' + insname)
+--- xmms2-0.7DrNo/wafadmin/Tools/gnu_dirs.py.plugins-use-libdir	2010-04-13 18:02:40.858675994 -0400
++++ xmms2-0.7DrNo/wafadmin/Tools/gnu_dirs.py	2010-04-13 18:03:01.201810629 -0400
+@@ -44,7 +44,7 @@ libexecdir, program executables, ${EXEC_
+ sysconfdir, read-only single-machine data, ${PREFIX}/etc
+ sharedstatedir, modifiable architecture-independent data, ${PREFIX}/com
+ localstatedir, modifiable single-machine data, ${PREFIX}/var
+-libdir, object code libraries, ${EXEC_PREFIX}/lib
++libdir, object code libraries, ${LIBDIR}
+ includedir, C header files, ${PREFIX}/include
+ oldincludedir, C header files for non-gcc, /usr/include
+ datarootdir, read-only arch.-independent data root, ${PREFIX}/share
+--- xmms2-0.7DrNo/wafadmin/Tools/python.py.plugins-use-libdir	2010-04-13 18:15:49.402785506 -0400
++++ xmms2-0.7DrNo/wafadmin/Tools/python.py	2010-04-13 18:22:03.243800732 -0400
+@@ -342,13 +342,10 @@
+ 				python_LIBDEST = None
+ 				(pydir,) = \
+ 						_get_python_variables(python,
+-											  ["get_python_lib(standard_lib=0, prefix=%r)" % conf.env['PREFIX']],
++											  ["get_python_lib(1)"],
+ 											  ['from distutils.sysconfig import get_config_var, get_python_lib'])
+ 			if python_LIBDEST is None:
+-				if conf.env['LIBDIR']:
+-					python_LIBDEST = os.path.join(conf.env['LIBDIR'], "python" + pyver)
+-				else:
+-					python_LIBDEST = os.path.join(conf.env['PREFIX'], "lib", "python" + pyver)
++				python_LIBDEST = os.path.join(conf.env['LIBDIR'], "python" + pyver)
+ 
+ 		if hasattr(conf, 'define'): # conf.define is added by the C tool, so may not exist
+ 			conf.define('PYTHONDIR', pydir)
diff --git a/xmms2.spec b/xmms2.spec
index f8a8a7a..5636973 100644
--- a/xmms2.spec
+++ b/xmms2.spec
@@ -1,12 +1,12 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
 
-%global codename DrMattDestruction
+%global codename DrNo
 
 Name:			xmms2
 Summary: 		A modular audio framework and plugin architecture
-Version:		0.6
-Release:		7%{?dist}
+Version:		0.7
+Release:		1%{?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.
@@ -15,13 +15,13 @@ Group:			Applications/Multimedia
 Source0:		%{name}-%{version}%{codename}-clean.tar.bz2
 Source1:		xmms2-client-launcher.sh
 # Use libdir properly for Fedora multilib
-Patch1:			xmms2-0.6DrMattDestruction-use-libdir.patch
+Patch1:			xmms2-0.7DrNo-use-libdir.patch
 # Set default output to pulse
 Patch2:			xmms2-0.6DrMattDestruction-pulse-output-default.patch
 # Don't add extra CFLAGS, we're smart enough, thanks.
-Patch4:			xmms2-0.5DrLecter-no-O0.patch
+Patch4:			xmms2-0.7DrNo-no-O0.patch
 # More sane versioning
-Patch5:			xmms2-0.6DrMattDestruction-moresaneversioning.patch
+Patch5:			xmms2-0.7DrNo-moresaneversioning.patch
 URL:			http://wiki.xmms2.xmms.se/
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:		sqlite-devel, flac-devel, libofa-devel
@@ -123,7 +123,7 @@ sed -i 's|"lib"|"%{_lib}"|g' wscript
 export CFLAGS="%{optflags}"
 export CPPFLAGS="%{optflags}"
 export LIBDIR="%{_libdir}"
-./waf configure --prefix=%{_prefix} --with-libdir=%{_libdir} --with-ruby-libdir=%{ruby_sitearch} --with-perl-archdir=%{perl_archlib} --with-pkgconfigdir=%{_libdir}/pkgconfig
+./waf configure --prefix=%{_prefix} --libdir=%{_libdir} --with-ruby-libdir=%{ruby_sitearch} --with-perl-archdir=%{perl_archlib} --with-pkgconfigdir=%{_libdir}/pkgconfig
 ./waf build -v %{?_smp_mflags}
 # make the docs
 doxygen
@@ -131,7 +131,8 @@ doxygen
 %install
 rm -rf %{buildroot}
 export LIBDIR="%{_libdir}"
-./waf install --destdir=%{buildroot} --prefix=%{_prefix} --with-libdir=%{_libdir} --with-ruby-libdir=%{ruby_sitearch} --with-perl-archdir=%{perl_archlib} --with-pkgconfigdir=%{_libdir}/pkgconfig
+export python_LIBDEST="%{python_sitearch}"
+./waf install --destdir=%{buildroot} --prefix=%{_prefix} --libdir=%{_libdir} --with-ruby-libdir=%{ruby_sitearch} --with-perl-archdir=%{perl_archlib} --with-pkgconfigdir=%{_libdir}/pkgconfig
 
 # exec flags for debuginfo
 chmod +x %{buildroot}%{_libdir}/%{name}/* %{buildroot}%{_libdir}/libxmmsclient*.so* %{buildroot}%{python_sitearch}/xmmsclient/xmmsapi.so \