diff --git a/.cvsignore b/.cvsignore
index 8ead2f8..9f906c9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-guitarix-0.05.0-1.tar.bz2
+guitarix-0.05.5-1.tar.bz2
diff --git a/guitarix-midiout.patch b/guitarix-midiout.patch
new file mode 100644
index 0000000..e0810ad
--- /dev/null
+++ b/guitarix-midiout.patch
@@ -0,0 +1,77 @@
+--- trunk/src/gx_engine.cpp	2009/12/13 09:24:02	433
++++ trunk/src/gx_engine.cpp	2009/12/16 19:36:03	434
+@@ -533,11 +533,11 @@
+   /* --- adding rest of engine class by file inclusion for readability --- */
+ 
+   /* MIDI engine */
+-#ifdef USE_RINGBUFFER
+-#include "gx_engine_midi_ringbuf.cpp"
+-#else
++//#ifdef USE_RINGBUFFER
++//#include "gx_engine_midi_ringbuf.cpp"
++//#else
+ #include "gx_engine_midi.cpp"
+-#endif
++//#endif
+ 
+   /* audio engine */
+ #include "gx_engine_audio.cpp"
+--- trunk/src/gx_engine_midi.cpp	2009/12/13 09:24:02	433
++++ trunk/src/gx_engine_midi.cpp	2009/12/16 19:36:03	434
+@@ -411,8 +411,8 @@
+                       if(Beat_is < rms)Beat_is += 2;
+                       //Beat_is = rms;
+                       send+=step;
+-                      if (fcheckbox10 == 1.0) send1+=step;
+-                      if (fcheckbox11 == 1.0) send2+=step;
++                      if (fcheckbox10 ) send1+=step;
++                      if (fcheckbox11 ) send2+=step;
+                     }
+                  // else weg +=step;
+                 }
+--- trunk/src/gx_gui_helpers.cpp	2009/12/13 09:24:02	433
++++ trunk/src/gx_gui_helpers.cpp	2009/12/16 19:36:03	434
+@@ -1525,6 +1525,33 @@
+       return FALSE;
+     }
+ 
++    gboolean label_expose(GtkWidget *wi, GdkEventExpose *ev, gpointer user_data)
++    {
++      if (int(float(gx_current_skin)==1))
++        {
++      GdkColor colorGreen;
++      gdk_color_parse("#000000", &colorGreen);
++      gtk_widget_modify_fg (wi, GTK_STATE_NORMAL, &colorGreen);
++      gdk_color_parse("#111111", &colorGreen);
++      gtk_widget_modify_fg (wi, GTK_STATE_PRELIGHT, &colorGreen);
++      gdk_color_parse("#222222", &colorGreen);
++      gtk_widget_modify_fg (wi, GTK_STATE_ACTIVE, &colorGreen);
++      gdk_color_parse("#333333", &colorGreen);
++      gtk_widget_modify_fg (wi, GTK_STATE_SELECTED, &colorGreen);
++        }
++        else{
++           GdkColor colorGreen;
++      gdk_color_parse("#a6a9aa", &colorGreen);
++      gtk_widget_modify_fg (wi, GTK_STATE_NORMAL, &colorGreen);
++      gdk_color_parse("#ffffff", &colorGreen);
++      gtk_widget_modify_fg (wi, GTK_STATE_PRELIGHT, &colorGreen);
++      gdk_color_parse("#ffffff", &colorGreen);
++      gtk_widget_modify_fg (wi, GTK_STATE_ACTIVE, &colorGreen);
++      gdk_color_parse("#a6a9aa", &colorGreen);
++      gtk_widget_modify_fg (wi, GTK_STATE_SELECTED, &colorGreen);
++        }
++      return FALSE;
++    }
+ 
+     gboolean box7_expose(GtkWidget *wi, GdkEventExpose *ev, gpointer user_data)
+     {
+--- trunk/src/headers/gx_gui_helpers.h	2009/12/13 09:24:02	433
++++ trunk/src/headers/gx_gui_helpers.h	2009/12/16 19:36:03	434
+@@ -44,6 +44,7 @@
+   gboolean box2_expose(GtkWidget *wi, GdkEventExpose *ev, gpointer user_data);
+   gboolean box1_expose(GtkWidget *wi, GdkEventExpose *ev, gpointer user_data);
+   gboolean box_expose (GtkWidget *wi, GdkEventExpose *ev, gpointer user_data);
++  gboolean label_expose(GtkWidget *wi, GdkEventExpose *ev, gpointer user_data);
+ 
+   /* guitarix skin related functions */
+   unsigned int gx_fetch_available_skins();
diff --git a/guitarix.spec b/guitarix.spec
index 38d7fa8..c1977f3 100644
--- a/guitarix.spec
+++ b/guitarix.spec
@@ -1,11 +1,14 @@
 Name:           guitarix
-Version:        0.05.0
-Release:        2%{?dist}
+Version:        0.05.5
+Release:        1%{?dist}
 Summary:        Mono amplifier to JACK
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://guitarix.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}-1.tar.bz2
+Source0:        http://downloads.sourceforge.net/project/%{name}/%{name}/%{name}-%{version}-1/%{name}-%{version}-1.tar.bz2
+# From upstream trunk:
+# http://guitarix.svn.sourceforge.net/viewvc/guitarix?view=rev&revision=434
+Patch0:         %{name}-midiout.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  boost-devel
@@ -18,6 +21,7 @@ BuildRequires:  libsndfile-devel
 Requires:       jack_capture
 Requires:       jconv
 Requires:       ladspa
+Requires:       qjackctl
 Requires:       vorbis-tools
 
 %description
@@ -37,12 +41,7 @@ all channels.
 
 %prep
 %setup -q -n %{name}-%{version}-1
-
-# Correct libdir path
-sed -i 's|lib/|%{_lib}/|' wscript
-
-# Comply with freedesktop standards
-sed -i 's|\.png||' %{name}.desktop
+%patch0 -p1 -b .midiout
 
 %build
 ./waf -vvv configure --prefix=%{_prefix} --cxxflags="%{optflags}" --ladspadir=%{_libdir}/ladspa
@@ -58,9 +57,6 @@ desktop-file-install                                    \
 %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
 
-%check
-desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
-
 %clean
 rm -rf %{buildroot}
 
@@ -76,6 +72,10 @@ rm -rf %{buildroot}
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Thu Dec 24 2009 Orcan Ogetbil <orcan@desitter> - 0.05.5-1
+- Update to 0.05.5
+- Add Requires: qjackctl. RHBZ #549566
+
 * Wed Aug 05 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.05.0-2
 - Update .desktop file
 
diff --git a/sources b/sources
index a71139c..888fcee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9f2543abbaca3af59bde0ec0ade15658  guitarix-0.05.0-1.tar.bz2
+4ffdd87871823562282a16975090d7e2  guitarix-0.05.5-1.tar.bz2