diff --git a/.gitignore b/.gitignore
index 98613ae..4efb7c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 guitarix-0.10.0.tar.bz2
 guitarix-0.11.0.tar.bz2
 /guitarix-0.11.1.tar.bz2
+/guitarix2-0.16.0.tar.bz2
diff --git a/guitarix-fix-ladspa-O3.patch b/guitarix-fix-ladspa-O3.patch
new file mode 100644
index 0000000..ec06fa3
--- /dev/null
+++ b/guitarix-fix-ladspa-O3.patch
@@ -0,0 +1,20 @@
+diff -Nurp guitarix2-0.16.0.orig/wscript guitarix2-0.16.0/wscript
+--- guitarix2-0.16.0.orig/wscript	2011-06-09 15:19:23.000000000 +1000
++++ guitarix2-0.16.0/wscript	2011-06-14 18:17:34.000000000 +1000
+@@ -85,7 +85,7 @@ def set_options(opt):
+ 
+     comp.add_option('--cxxflags-release',
+                     type='string',
+-                    default='-O3 -DNDEBUG',
++                    default='-DNDEBUG',
+                     dest='cxxflags_release',
+                     help='additional C++ compiler flags for release version (not used if --debug) [Default: %default]')
+ 
+@@ -420,6 +420,7 @@ def configure(conf):
+     conf.check_cfg(package='fftw3f', atleast_version='3.1.2', args='--cflags --libs', uselib_store='FFTW3', mandatory=1)
+     if not Options.options.no_ladspa:
+         conf.check(header_name='ladspa.h', mandatory=1)
++        conf.env['LADSPA'] = True
+     conf.check(header_name='boost/format.hpp', mandatory=1)
+     # convolver and resampler
+     if not Options.options.includeconvolver:
diff --git a/guitarix-fsf-address.patch b/guitarix-fsf-address.patch
new file mode 100644
index 0000000..dbadfea
--- /dev/null
+++ b/guitarix-fsf-address.patch
@@ -0,0 +1,12 @@
+diff -Nurp guitarix2-0.16.0.orig/COPYING guitarix2-0.16.0/COPYING
+--- guitarix2-0.16.0.orig/COPYING	2011-06-09 15:22:40.000000000 +1000
++++ guitarix2-0.16.0/COPYING	2011-06-14 18:21:25.000000000 +1000
+@@ -21,7 +21,7 @@
+ 		       Version 2, June 1991
+ 
+  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++                       51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  Everyone is permitted to copy and distribute verbatim copies
+  of this license document, but changing it is not allowed.
+ 
diff --git a/guitarix.spec b/guitarix.spec
index f4d8823..3244842 100644
--- a/guitarix.spec
+++ b/guitarix.spec
@@ -1,11 +1,21 @@
+# guitarix has merged with gx_head branch and tarball is distributed as guitarix2
+# project name remains guitarix however
+%define altname gx_head
+%define altname2 guitarix2
+
 Name:           guitarix
-Version:        0.11.1
-Release:        2%{?dist}
+#guitarix2-0.16.0
+Version:        0.16.0
+Release:        3%{?dist}
 Summary:        Mono amplifier to JACK
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://guitarix.sourceforge.net/
-Source0:        http://sourceforge.net/projects/%{name}/files/%{name}/%{name}-%{version}.tar.bz2
+Source0:        http://sourceforge.net/projects/%{name}/files/%{name}/%{altname2}-%{version}.tar.bz2
+# remove O3 compile option and fix build of ladspa plugins (included upstream)
+Patch0:         guitarix-fix-ladspa-O3.patch
+# Correct FSF address - included upstream
+Patch1:         guitarix-fsf-address.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  boost-devel
@@ -20,12 +30,16 @@ BuildRequires:  libsigc++20-devel
 BuildRequires:  libsndfile-devel
 BuildRequires:  zita-convolver-devel
 BuildRequires:  zita-resampler-devel >= 0.1.1-3
+BuildRequires:  gettext-devel
+BuildRequires:  intltool
 
 Requires:       jack_capture
 Requires:       jconv
 Requires:       ladspa-%{name}-plugins = %{version}-%{release}
 Requires:       qjackctl
 Requires:       vorbis-tools
+Provides:       gx_head = %{version}-%{release}
+Obsoletes:      gx_head < 0.14.0-4
 
 %description
 Guitarix is a simple mono amplifier to be used in a 'JACKified' environment,
@@ -59,16 +73,14 @@ and monocompressor ladspa plug-ins that come together with guitarix, but can
 also be used by any other ladspa host.
 
 %prep
-%setup -q
+%setup -q -n %{altname2}-%{version}
+%patch0 -p1 
+%patch1 -p1
 
 # The build system does not use these bundled libraries by default. But
 # just to make sure:
 rm -fr src/zita-convolver src/zita-resampler
 
-# Fix build flags
-sed -i 's|-O3 ||' wscript
-
-
 %build
 ./waf -vv configure --prefix=%{_prefix}                                      \
       --cxxflags="-std=c++0x -fomit-frame-pointer -ftree-loop-linear         \
@@ -89,16 +101,20 @@ desktop-file-install                                    \
 --dir=%{buildroot}%{_datadir}/applications              \
 %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
+chmod 644 %{buildroot}/%{_datadir}/%{altname}/sounds/*
+chmod 644 %{buildroot}/%{_datadir}/%{altname}/skins/*
+
+%find_lang %{name}
 
 %clean
 rm -rf %{buildroot}
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc changelog COPYING README
 %{_bindir}/%{name}
-%{_datadir}/%{name}/
+%{_datadir}/%{altname}/
 %{_datadir}/ladspa/rdf/%{name}.rdf
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/%{name}.desktop
@@ -108,6 +124,17 @@ rm -rf %{buildroot}
 %{_libdir}/ladspa/*.so
 
 %changelog
+* Wed Jun 15 2011 Brendan Jones <brendan.jones.it@gmail.com> - 0.16.0-3
+- Add BuildRequires gettext
+
+* Wed Jun 15 2011 Brendan Jones <brendan.jones.it@gmail.com> - 0.16.0-2
+- Add BuildRequires gettext
+
+* Mon Jun 14 2011 Brendan Jones <brendan.jones.it@gmail.com> - 0.16.0-1
+- Updated to version 0.16.0-1 which combines guitarix and gx_head
+- Obsoletes gx_head
+- Correct build of ladspa plugins and removed O3 optimizations
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.11.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index fd72f68..dab85f9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1c95a67c0788d6ffe609e430d4b57169  guitarix-0.11.1.tar.bz2
+454d71381fbdc42a2f4da63b67333c79  guitarix2-0.16.0.tar.bz2