diff --git a/.gitignore b/.gitignore
index 2dccd19..2f7eca3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /muse-2.1.tar.gz
 /muse-2.1.1.tar.gz
 /muse-2.1.2.tar.gz
+/muse-2.2.1.tar.gz
diff --git a/muse.spec b/muse.spec
index dd13937..e71c72b 100644
--- a/muse.spec
+++ b/muse.spec
@@ -1,16 +1,23 @@
-%global maj 2.1
+%global maj 2.2
 # No need to provide & require internal libraries
-%filter_provides_in %{_libdir}/%{name}-%{version}.*/.*/.*\.so$
+%filter_provides_in %{_libdir}/%{name}-%{maj}.*/.*/.*\.so$
 %filter_from_requires /libmuse_.*\.so.*/d
 %filter_setup
 
+# lv2 gtk2 helper target
+%ifarch x86_64
+%global LV2_GTK_HELPER lv2Gtk2Helper64.so
+%else
+%global LV2_GTK_HELPER lv2Gtk2Helper32.so
+%endif
+
 Name:          muse
 Summary:       Midi/Audio Music Sequencer
 # Epoch is set to 1 for PlanetCCRMA compatibility.
 # See: https://fedoraproject.org/wiki/AudioCreation
 Epoch:         1
-Version:       2.1.2
-Release:       9%{?dist}
+Version:       2.2.1
+Release:       1%{?dist}
 # original freeverb plugin was public domain
 # givertcap (not built) is GPLv2
 # The rest, including the core of muse is distributed under GPLv2+
@@ -28,12 +35,16 @@ BuildRequires: jack-audio-connection-kit-devel
 BuildRequires: ladspa-devel
 BuildRequires: lash-devel
 BuildRequires: liblo-devel
+BuildRequires: lilv-devel
 BuildRequires: libsamplerate-devel
 BuildRequires: libsndfile-devel
 BuildRequires: pkgconfig
-BuildRequires: python-devel
+BuildRequires: python2-devel
 BuildRequires: qt4-devel
 
+# For lv2 plugins
+BuildRequires: gtkmm24-devel
+
 Requires:      hicolor-icon-theme
 
 %description
@@ -46,18 +57,23 @@ for Linux.
 %prep
 %setup -q
 
+# remove precompiled binaries
+find . -name "*.so" -exec rm {} \;
+
+# install only the helper with the appropriate bitness
+sed -i "s|\(install(FILES\).*|\1 %LV2_GTK_HELPER|" muse/lv2Gtk2Helper/CMakeLists.txt
+
+# Module dependency fix. This is fixed in upstream trunk
+sed -i 's|awl|awl widgets|' muse/liste/CMakeLists.txt synti/deicsonze/CMakeLists.txt
 
 %build
+make -C muse/lv2Gtk2Helper/ %LV2_GTK_HELPER DEBUGFLAGS="%{optflags} -std=gnu++11" FLAGS32= FLAGS64=
+
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake} .. \
-%if 0%fedora < 20
-   -DMusE_DOC_DIR=%{_docdir}/%{name}-%{version}/ \
-%else
-   -DMusE_DOC_DIR=%{_pkgdocdir}/ \
-%endif
-   -DENABLE_PYTHON=1
-
+    -DMusE_DOC_DIR=%{_pkgdocdir}/ \
+    -DENABLE_PYTHON=1
 make %{?_smp_mflags}
 
 
@@ -71,28 +87,24 @@ desktop-file-validate \
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null
 touch --no-create %{_datadir}/mime/packages &> /dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
     touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-    touch --no-create %{_datadir}/mime/packages &> /dev/null || :
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null
+    touch --no-create %{_datadir}/mime/packages &> /dev/null
     update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 fi
 
 %posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null
 update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 
 %files
-%if 0%fedora < 20
-%{_docdir}/%{name}-%{version}/
-%else
 %{_pkgdocdir}
-%endif
 %{_bindir}/%{name}*
 %{_bindir}/grepmidi
 %{_libdir}/%{name}-%{maj}*/
@@ -104,6 +116,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %{_datadir}/mime/packages/muse.xml
 
 %changelog
+* Fri Feb 05 2016 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1:2.2.1-1
+- MusE-2.2.1
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.1.2-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
@@ -253,7 +268,7 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 - make sure LADSPA plugins are searched in the right lib directory
   for all architectures
 
-* Thu May  5 2006 Fernando Lopez-Lezcano <nando@ccrma.stanford.edu> 
+* Fri May  5 2006 Fernando Lopez-Lezcano <nando@ccrma.stanford.edu> 
 - added icon and Planet CCRMA categories
 
 * Tue Mar 28 2006 Fernando Lopez-Lezcano <nando@ccrma.stanford.edu> 0.8.1a-1
@@ -273,7 +288,7 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 - added readline-devel (needed by lash)
 - delete --enable-rtcap option to configure
 
-* Sun Jun 25 2005 Fernando Lopez-Lezcano <nando@ccrma.stanford.edu> 
+* Sat Jun 25 2005 Fernando Lopez-Lezcano <nando@ccrma.stanford.edu> 
 - do not create givertcap package anymore, fc4 mach is confused by
   the version and it is not needed anymore
 
@@ -282,7 +297,7 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 - needs libsamplerate
 - added --enable-ladcca configure flag (has to be explicitly enabled)
 
-* Tue Dec 31 2004 Fernando Lopez-Lezcano <nando@ccrma.stanford.edu> 
+* Fri Dec 31 2004 Fernando Lopez-Lezcano <nando@ccrma.stanford.edu> 
 - spec file cleanup
 
 * Sun Sep 26 2004 Fernando Lopez-Lezcano <nando@ccrma.stanford.edu> 
diff --git a/sources b/sources
index dd266ba..cbbeb9a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ad917335ac05a3d62e3cd073af901001  muse-2.1.2.tar.gz
+985e96c9513d0b2baad8386bc0adc4d8  muse-2.2.1.tar.gz