diff --git a/dev-qt/monkeystudio/monkeystudio-1.9.0.4.recipe b/dev-qt/monkeystudio/monkeystudio-1.9.0.4.recipe
index 3e60d08cb..be1db2f3b 100644
--- a/dev-qt/monkeystudio/monkeystudio-1.9.0.4.recipe
+++ b/dev-qt/monkeystudio/monkeystudio-1.9.0.4.recipe
@@ -29,12 +29,12 @@ languages."
 HOMEPAGE="http://www.monkeystudio.org"
 COPYRIGHT="2005-2016 Azevedo Filipe & The Monkey Studio Team"
 LICENSE="GNU GPL v2"
-REVISION="4"
+REVISION="5"
 COMMIT="01256a61395ae92e25d65c97b23a76212d8754a5"
 SOURCE_URI="https://github.com/pasnox/monkeystudio2/archive/$COMMIT.zip"
 CHECKSUM_SHA256="ebb9cecef699c097dd12e567e8fca1d037a1fd020263fa5d5bf44b92343b5323"
 SOURCE_DIR="monkeystudio2-$COMMIT"
-PATCHES="monkeystudio-$portVersion.patch"
+PATCHES="monkeystudio-$portVersion.patchset"
 ADDITIONAL_FILES="monkeystudio.rdef.in"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
diff --git a/dev-qt/monkeystudio/patches/monkeystudio-1.9.0.4.patch b/dev-qt/monkeystudio/patches/monkeystudio-1.9.0.4.patch
deleted file mode 100644
index 18424fc30..000000000
--- a/dev-qt/monkeystudio/patches/monkeystudio-1.9.0.4.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From cc357095af73c88c2cc267bc355ad59476afde50 Mon Sep 17 00:00:00 2001
-From: Augustin Cavalier <waddlesplash@gmail.com>
-Date: Wed, 3 Dec 2014 20:58:56 -0500
-Subject: [PATCH] Don't pass -rdynamic on Haiku.
-
-Our GCC4 doesn't support this and throws an error.
----
- monkey/monkey.pro | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/monkey/monkey.pro b/monkey/monkey.pro
-index a5f6cfc..bd7910f 100644
---- a/monkey/monkey.pro
-+++ b/monkey/monkey.pro
-@@ -28,7 +28,7 @@ mac {
- } else {
-     *-*g++* {
-         LIBS    *= -Wl,--whole-archive # import all symbols as the not used ones too
--        unix:LIBS   *= -rdynamic
-+        unix:LIBS   *=
-     } else:*-*clang* {
-         LIBS    *= -Wl,--whole-archive # import all symbols as the not used ones too
-         unix:LIBS   *= -rdynamic
--- 
-1.8.3.4
-
diff --git a/dev-qt/monkeystudio/patches/monkeystudio-1.9.0.4.patchset b/dev-qt/monkeystudio/patches/monkeystudio-1.9.0.4.patchset
new file mode 100644
index 000000000..eec308b2a
--- /dev/null
+++ b/dev-qt/monkeystudio/patches/monkeystudio-1.9.0.4.patchset
@@ -0,0 +1,46 @@
+From cc357095af73c88c2cc267bc355ad59476afde50 Mon Sep 17 00:00:00 2001
+From: Augustin Cavalier <waddlesplash@gmail.com>
+Date: Wed, 3 Dec 2014 20:58:56 -0500
+Subject: [PATCH] Don't pass -rdynamic on Haiku.
+
+Our GCC4 doesn't support this and throws an error.
+
+diff --git a/monkey/monkey.pro b/monkey/monkey.pro
+index a5f6cfc..bd7910f 100644
+--- a/monkey/monkey.pro
++++ b/monkey/monkey.pro
+@@ -28,7 +28,7 @@ mac {
+ } else {
+     *-*g++* {
+         LIBS    *= -Wl,--whole-archive # import all symbols as the not used ones too
+-        unix:LIBS   *= -rdynamic
++        unix:LIBS   *=
+     } else:*-*clang* {
+         LIBS    *= -Wl,--whole-archive # import all symbols as the not used ones too
+         unix:LIBS   *= -rdynamic
+-- 
+2.15.0
+
+
+From 7dcb03005f3a06eae7cf25bf2e6a24a87fe8ae55 Mon Sep 17 00:00:00 2001
+From: Sergei Reznikov <diver@gelios.net>
+Date: Mon, 18 Dec 2017 11:41:28 +0300
+Subject: Link against qscintilla2_qt5
+
+
+diff --git a/qscintilla/qscintilla.pri b/qscintilla/qscintilla.pri
+index 51a052b..d2e8ddc 100644
+--- a/qscintilla/qscintilla.pri
++++ b/qscintilla/qscintilla.pri
+@@ -22,7 +22,7 @@ isEqual( SYSTEM_QSCINTILLA, 1 ) {
+ 
+ QSCINTILLA_TARGET   = qscintilla2
+ greaterThan(QT_MAJOR_VERSION, 4) {
+-    isEqual( SYSTEM_QSCINTILLA, 1 ):QSCINTILLA_TARGET   = qt5scintilla2
++    isEqual( SYSTEM_QSCINTILLA, 1 ):QSCINTILLA_TARGET   = qscintilla2_qt5
+     QT *= widgets printsupport
+     # MacExtras is Qt 5.2 & up
+     greaterThan(QT_MINOR_VERSION, 1) {
+-- 
+2.15.0
+