diff --git a/.gitignore b/.gitignore
index 4a48c22..8f1c42c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,10 +3,10 @@ guitarix-0.11.0.tar.bz2
 /guitarix-0.11.1.tar.bz2
 /guitarix2-0.16.0.tar.bz2
 /guitarix2-0.17.0.tar.bz2
-<<<<<<< HEAD
 /guitarix2-0.19.0-svn1245.tar.bz2
-=======
->>>>>>> eb2f8801040969d8acb50eb969b246f19feab35b
 /guitarix2-0.20.2.tar.bz2
 /guitarix2-0.21.0.tar.bz2
 /guitarix-0.21.0-glib.patch
+/guitarix2-0.22.2.tar.bz2
+/guitarix2-0.22.4.tar.bz2
+/guitarix2-0.23.2.tar.bz2
diff --git a/guitarix-snapshot.sh b/guitarix-snapshot.sh
deleted file mode 100644
index 7df349e..0000000
--- a/guitarix-snapshot.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-# $1 - revision number to checkout.
-: ${1?"You must either provide desired revision number \"X\" to checkout: `basename $0` X
-                                or fetch the latest revision by: `basename $0` HEAD"}
-
-set -e
-
-tmp=$(mktemp -d)
-
-trap cleanup EXIT
-cleanup() {
-    set +e
-    [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
-}
-
-unset CDPATH
-pwd=$(pwd)
-name=guitarix2
-version=0.20.0
-
-revision=$1
-
-pushd "$tmp" >/dev/null
-echo "Fetching SVN revision: $1"
-svn export -r$revision https://guitarix.svn.sourceforge.net/svnroot/guitarix/trunk $name-$version |tee $name.stdout
-revision=$(cat $name.stdout|grep "Exported revision"|sed 's|[^0-9]*||g')
-echo "Fetched SVN revision: $revision"
-rm -f $name.stdout
-
-tar jcf "$pwd"/$name-$version-svn$revision.tar.bz2 $name-$version
-echo "Written: $name-$version-svn$revision.tar.bz2"
-popd >/dev/null
diff --git a/guitarix.spec b/guitarix.spec
index e07f41f..4b62ff7 100644
--- a/guitarix.spec
+++ b/guitarix.spec
@@ -4,8 +4,8 @@
 %global altname2 guitarix2
 
 Name:           guitarix
-Version:        0.22.3
-Release:        1%{?dist}
+Version:        0.23.2
+Release:        2%{?dist}
 Summary:        Mono amplifier to JACK
 Group:          Applications/Multimedia
 License:        GPLv2+
@@ -26,7 +26,7 @@ BuildRequires:  zita-resampler-devel >= 0.1.1-3
 BuildRequires:  gettext-devel
 BuildRequires:  intltool
 BuildRequires:  boost-devel
-
+BuildRequires:  liblrdf-devel
 Requires:       jack_capture
 Requires:       jconv
 Requires:       ladspa-%{name}-plugins = %{version}-%{release}
@@ -72,6 +72,7 @@ also be used by any other ladspa host.
 # The build system does not use these bundled libraries by default. But
 # just to make sure:
 rm -fr src/zita-convolver src/zita-resampler
+sed -i -e 's|-O3|%{optflags}|' wscript
 
 %build
 ./waf -vv configure --prefix=%{_prefix}                                      \
@@ -111,11 +112,23 @@ chmod 644 %{buildroot}/%{_datadir}/%{altname}/skins/*
 %{_datadir}/ladspa
 
 %changelog
-* Tue May 15 2012 Brendan Jones <brendan.jones.it@gmail.com> - 0.22.3-1
-- Update to 0.22.3 
+* Sun Jul 15 2012 Brendan Jones <brendan.jones.it@gmail.com> 0.23.2-2
+- Add missing BuildRequires (lrdf)
 
-* Wed Jan 18 2012 Brendan Jones <brendan.jones.it@gmail.com> - 0.21.0-2
-- Remove parallel build
+* Sun Jul 15 2012 Brendan Jones <brendan.jones.it@gmail.com> 0.23.2-1
+- Update to upstream 0.23.3
+
+* Mon Jul 02 2012 Brendan Jones <brendan.jones.it@gmail.com> 0.22.4-1
+- Update to upstream 0.22.4
+
+* Tue May 15 2012 Brendan Jones <brendan.jones.it@gmail.com> - 0.22.3-1
+- Update to upstream 0.22.3
+
+* Thu May 03 2012 Brendan Jones <brendan.jones.it@gmail.com> - 0.22.2-1
+- Update to upstream 0.22.2
+
+* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.21.0-2
+- Rebuilt for c++ ABI breakage
 
 * Tue Jan 17 2012 Brendan Jones <brendan.jones.it@gmail.com> - 0.21.0-1
 - Update to upstream 0.21.0, correct fail to build (missing glibmm headers)
@@ -123,9 +136,6 @@ chmod 644 %{buildroot}/%{_datadir}/%{altname}/skins/*
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.20.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
-* Sun Nov 20 2011 Adam Huffman <adam@vaioz.verdurin.salon> - 0.20.2-4
-- rebuild for new Boost in Rawhide
-
 * Sat Nov 12 2011 Brendan Jones <brendan.jones.it@gmail.com> - 0.20.2-3
 - Add boost-devel build requires
 
diff --git a/guitarix2-0.23.2.tar.bz2 b/guitarix2-0.23.2.tar.bz2
new file mode 100644
index 0000000..51a2677
Binary files /dev/null and b/guitarix2-0.23.2.tar.bz2 differ
diff --git a/sources b/sources
index 972cd07..74139e8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-ed40664453c9b2b61240f46ffee62f14  guitarix2-0.21.0.tar.bz2
-e072f1abfe770aa6e55900e8d8bacb60  guitarix-0.21.0-glib.patch
+aebd7945c2286c04d38cdf561a584c2d  guitarix2-0.23.2.tar.bz2