diff --git a/dev-qt/monkeystudio/additional-files/monkeystudio.rdef b/dev-qt/monkeystudio/additional-files/monkeystudio.rdef.in
similarity index 86%
rename from dev-qt/monkeystudio/additional-files/monkeystudio.rdef
rename to dev-qt/monkeystudio/additional-files/monkeystudio.rdef.in
index 9dab00741..1fda437ce 100644
--- a/dev-qt/monkeystudio/additional-files/monkeystudio.rdef
+++ b/dev-qt/monkeystudio/additional-files/monkeystudio.rdef.in
@@ -1,20 +1,25 @@
-resource app_signature "application/x-vnd.monkeystudio";
 
-resource app_flags B_SINGLE_LAUNCH;
+resource app_flags B_SINGLE_LAUNCH | B_ARGV_ONLY;
 
 resource app_version {
-	major  = 1,
-	middle = 9,
-	minor  = 0,
+	major  = @MAJOR@,
+	middle = @MIDDLE@,
+	minor  = @MINOR@,
 
-	/* 0 = development	1 = alpha			2 = beta
-	   3 = gamma		4 = golden master	5 = final */
-	variety = 0,
-
-	internal = 4,
+	variety = B_APPV_FINAL,
+	internal = 0,
 
 	short_info = "A cross platform IDE",
-	long_info  = "An IDE written in C++/Qt"
+	long_info = "@LONG_INFO@"
+};
+
+resource app_signature "@APP_SIGNATURE@";
+
+resource file_types message {
+	"types" = "text/x-jamfile",
+	"types" = "text/x-makefile",
+	"types" = "text/x-patch",
+	"types" = "text/x-source-code"
 };
 
 resource vector_icon {
diff --git a/dev-qt/monkeystudio/monkeystudio-1.9.0.4.recipe b/dev-qt/monkeystudio/monkeystudio-1.9.0.4.recipe
index 8756f8592..8273dbedf 100644
--- a/dev-qt/monkeystudio/monkeystudio-1.9.0.4.recipe
+++ b/dev-qt/monkeystudio/monkeystudio-1.9.0.4.recipe
@@ -27,41 +27,43 @@ the file and allows you to jump to the line in the code where the object \
 is located. Navigation based on Exuberant Ctags supports 31 programming \
 languages."
 HOMEPAGE="http://www.monkeystudio.org"
-COPYRIGHT="2005-2012 Azevedo Filipe & The Monkey Studio Team"
+COPYRIGHT="2005-2016 Azevedo Filipe & The Monkey Studio Team"
 LICENSE="GNU GPL v2"
-REVISION="3"
-SOURCE_URI="http://monkeystudio.googlecode.com/files/mks_1.9.0.4-src.tar.gz"
-CHECKSUM_SHA256="cfd3517ac6d4a5d8ffdf7ec9995a624b6cef13aa00163e46a9b54b1f52164ffd"
-SOURCE_DIR="mks_$portVersion-src"
+REVISION="4"
+COMMIT="01256a61395ae92e25d65c97b23a76212d8754a5"
+SOURCE_URI="https://github.com/pasnox/monkeystudio2/archive/$COMMIT.zip"
+CHECKSUM_SHA256="ebb9cecef699c097dd12e567e8fca1d037a1fd020263fa5d5bf44b92343b5323"
+SOURCE_DIR="monkeystudio2-$COMMIT"
 PATCHES="monkeystudio-$portVersion.patch"
-ADDITIONAL_FILES="monkeystudio.rdef"
+ADDITIONAL_FILES="monkeystudio.rdef.in"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	monkeystudio${secondaryArchSuffix} = $portVersion
-	app:MonkeyStudio${secondaryArchSuffix} = $portVersion
+	monkeystudio$secondaryArchSuffix = $portVersion
+	app:MonkeyStudio$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku${secondaryArchSuffix}
-	libqt4${secondaryArchSuffix} >= 4.8.0
+	haiku$secondaryArchSuffix
+	libQt5Core$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	libqt4${secondaryArchSuffix}_devel >= 4.8.0
+	devel:libqscintilla2$secondaryArchSuffix
+	devel:libqt5Core$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:qmake${secondaryArchSuffix} >= 4.8
+	cmd:qmake$secondaryArchSuffix
 	cmd:make
-	cmd:g++${secondaryArchSuffix}
+	cmd:g++$secondaryArchSuffix
 	"
 
 BUILD()
 {
 	qmake -set SYSTEM_QSCINTILLA 0
-	qmake -r prefix=$appsDir/MonkeyStudio
+	qmake -r monkeystudio.pro prefix=$appsDir/MonkeyStudio
 	make $jobArgs
 }
 
@@ -70,14 +72,23 @@ INSTALL()
 	monkeyDir=$appsDir/MonkeyStudio
 	mkdir -p $monkeyDir
 	make install
-
-	addResourcesToBinaries $portDir/additional-files/monkeystudio.rdef \
-		$monkeyDir/bin/monkeystudio
 	mv $monkeyDir/bin/monkeystudio $monkeyDir/bin/MonkeyStudio
 
-	rm -rf $monkeyDir/share/applications
-	rm -rf $monkeyDir/share/doc
-	rm -rf $monkeyDir/share/pixmaps
+	rm -rf $monkeyDir/share/{applications,doc,pixmap}
 
+	local APP_SIGNATURE="application/x-vnd.monkeystudio"
+	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
+	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
+	local MINOR="`echo "$portVersion" | cut -d. -f3`"
+	local LONG_INFO="$SUMMARY"
+	sed \
+		-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
+		-e "s|@MAJOR@|$MAJOR|" \
+		-e "s|@MIDDLE@|$MIDDLE|" \
+		-e "s|@MINOR@|$MINOR|" \
+		-e "s|@LONG_INFO@|$LONG_INFO|" \
+		$portDir/additional-files/monkeystudio.rdef.in > monkeystudio.rdef
+
+	addResourcesToBinaries monkeystudio.rdef $monkeyDir/bin/monkeystudio
 	addAppDeskbarSymlink $monkeyDir/bin/MonkeyStudio
 }
diff --git a/dev-qt/monkeystudio/patches/monkeystudio-1.9.0.4.patch b/dev-qt/monkeystudio/patches/monkeystudio-1.9.0.4.patch
index 452326705..18424fc30 100644
--- a/dev-qt/monkeystudio/patches/monkeystudio-1.9.0.4.patch
+++ b/dev-qt/monkeystudio/patches/monkeystudio-1.9.0.4.patch
@@ -9,17 +9,18 @@ Our GCC4 doesn't support this and throws an error.
  1 file changed, 1 deletion(-)
 
 diff --git a/monkey/monkey.pro b/monkey/monkey.pro
-index e006f70..a11d135 100644
+index a5f6cfc..bd7910f 100644
 --- a/monkey/monkey.pro
 +++ b/monkey/monkey.pro
-@@ -20,7 +20,6 @@ LIBS    *= -L$${PACKAGE_BUILD_PATH}/$${Q_TARGET_ARCH}/$$buildMode()
- mac:*-g++*:LIBS *= -Wl,-all_load # import all symbols as the not used ones too
- else:*-g++*:LIBS    *= -Wl,--whole-archive # import all symbols as the not used ones too
- mac:*-g++*:LIBS *= -dynamic
--else:unix:*-g++*:LIBS   *= -rdynamic
- 
- # include qscintilla framework
- include( ../qscintilla/qscintilla.pri )
+@@ -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