diff --git a/audio/hydrogen/README b/audio/hydrogen/README
index 6f5f4b8494..7056665f28 100644
--- a/audio/hydrogen/README
+++ b/audio/hydrogen/README
@@ -2,5 +2,6 @@ Hydrogen is an advanced drum machine for GNU/Linux.
 It's main goal is to bring professional yet simple 
 and intuitive pattern-based drum programming. 
 
-portaudio and portmidi are optional dependencies.
+rubberband, portaudio and portmidi are optional
+dependencies.
 PORTAUDIO=yes enables portmidi support.
diff --git a/audio/hydrogen/hydrogen.SlackBuild b/audio/hydrogen/hydrogen.SlackBuild
index 41b280b0e1..d01da9b775 100644
--- a/audio/hydrogen/hydrogen.SlackBuild
+++ b/audio/hydrogen/hydrogen.SlackBuild
@@ -27,7 +27,7 @@
 
 PRGNAM=hydrogen
 VERSION=${VERSION:-0.9.5}
-BUILD=${BUILD:-5}
+BUILD=${BUILD:-6}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -87,7 +87,9 @@ else
   EXTRACONF="$EXTRACONF jack=0"
 fi
 
-patch --verbose -p1 < $CWD/sconstruct-install-images.patch
+patch --verbose -p1 < $CWD/patches/sconstruct-install-images.patch
+patch --verbose -p1 < $CWD/patches/sconstruct-raptor2.patch
+patch --verbose -p1 < $CWD/patches/gcc47.patch
 
 QTDIR=$QT4DIR \
 scons \
diff --git a/audio/hydrogen/patches/gcc47.patch b/audio/hydrogen/patches/gcc47.patch
new file mode 100644
index 0000000000..41537bc647
--- /dev/null
+++ b/audio/hydrogen/patches/gcc47.patch
@@ -0,0 +1,33 @@
+diff -Naur hydrogen-0.9.5.orig/gui/src/MainForm.cpp hydrogen-0.9.5/gui/src/MainForm.cpp
+--- hydrogen-0.9.5.orig/gui/src/MainForm.cpp	2011-02-08 10:15:04.000000000 +0100
++++ hydrogen-0.9.5/gui/src/MainForm.cpp	2012-09-12 17:40:17.305970299 +0200
+@@ -20,6 +20,7 @@
+  *
+  */
+ #include "version.h"
++#include "unistd.h"
+ 
+ 
+ #include <hydrogen/hydrogen.h>
+diff -Naur hydrogen-0.9.5.orig/gui/src/SongEditor/SongEditor.cpp hydrogen-0.9.5/gui/src/SongEditor/SongEditor.cpp
+--- hydrogen-0.9.5.orig/gui/src/SongEditor/SongEditor.cpp	2010-03-28 12:06:05.000000000 +0200
++++ hydrogen-0.9.5/gui/src/SongEditor/SongEditor.cpp	2012-09-12 17:37:17.764043771 +0200
+@@ -23,6 +23,7 @@
+ #include <assert.h>
+ #include <algorithm>
+ #include <memory>
++#include <unistd.h>
+ 
+ #include <hydrogen/Song.h>
+ #include <hydrogen/hydrogen.h>
+diff -Naur hydrogen-0.9.5.orig/libs/hydrogen/src/IO/portmidi_driver.cpp hydrogen-0.9.5/libs/hydrogen/src/IO/portmidi_driver.cpp
+--- hydrogen-0.9.5.orig/libs/hydrogen/src/IO/portmidi_driver.cpp	2010-02-01 22:06:17.000000000 +0100
++++ hydrogen-0.9.5/libs/hydrogen/src/IO/portmidi_driver.cpp	2012-09-12 17:45:38.426002346 +0200
+@@ -20,6 +20,7 @@
+  *
+  */
+ 
++#include "unistd.h"
+ #include "PortMidiDriver.h"
+ 
+ #include <hydrogen/Preferences.h>
diff --git a/audio/hydrogen/sconstruct-install-images.patch b/audio/hydrogen/patches/sconstruct-install-images.patch
similarity index 100%
rename from audio/hydrogen/sconstruct-install-images.patch
rename to audio/hydrogen/patches/sconstruct-install-images.patch
diff --git a/audio/hydrogen/patches/sconstruct-raptor2.patch b/audio/hydrogen/patches/sconstruct-raptor2.patch
new file mode 100644
index 0000000000..a5e374410f
--- /dev/null
+++ b/audio/hydrogen/patches/sconstruct-raptor2.patch
@@ -0,0 +1,11 @@
+diff -Naur hydrogen-0.9.5.orig/Sconstruct hydrogen-0.9.5/Sconstruct
+--- hydrogen-0.9.5.orig/Sconstruct	2011-03-15 13:22:35.000000000 +0100
++++ hydrogen-0.9.5/Sconstruct	2012-09-12 17:32:56.865019039 +0200
+@@ -81,6 +81,7 @@
+ 	if str(env['libarchive']) == "1": cppflags.append('-DLIBARCHIVE_SUPPORT')
+ 
+ 	includes.append( './' )
++	includes.append( '/usr/include/raptor2' )
+ 	includes.append( 'gui/src/' )
+ 	includes.append( '3rdparty/install/include' )
+