diff --git a/kde-base/marble/marble-17.07.80.recipe b/kde-base/marble/marble-17.07.80.recipe
new file mode 100644
index 000000000..00a2dfb3a
--- /dev/null
+++ b/kde-base/marble/marble-17.07.80.recipe
@@ -0,0 +1,100 @@
+SUMMARY="A virtual globe and world atlas"
+DESCRIPTION="Marble is a geographical atlas and a virtual globe which lets you \
+quickly explore places on our home planet.
+
+You can use Marble to look up addresses, to easily create maps, \
+measure distances and to retrieve detail information about locations \
+that you have just heard about in the news or on the Internet.
+
+The user interface is clean, simple and easy to use."
+HOMEPAGE="https://marble.kde.org/"
+COPYRIGHT="2007-2017 by the authors of Marble Virtual Globe"
+LICENSE="GNU LGPL v2.1"
+REVISION="1"
+SOURCE_URI="https://github.com/KDE/marble/archive/v$portVersion.tar.gz"
+CHECKSUM_SHA256="ba439e99b9d6ec3d66295be49e55e6592d29e380e072d45d5fa0d08f829a6f8b"
+ADDITIONAL_FILES="marble.rdef.in"
+
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	marble$secondaryArchSuffix = $portVersion
+	app:Marble$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku${secondaryArchSuffix}
+	lib:libQt5Core$secondaryArchSuffix
+	lib:libQt5DBus$secondaryArchSuffix
+	lib:libQt5Gui$secondaryArchSuffix
+	lib:libQt5Network$secondaryArchSuffix
+	lib:libQt5PrintSupport$secondaryArchSuffix
+	lib:libQt5WebKit$secondaryArchSuffix
+	lib:libQt5WebKitWidgets$secondaryArchSuffix
+	lib:libQt5Widgets$secondaryArchSuffix
+	lib:libQt5Xml$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libQt5Core$secondaryArchSuffix
+	devel:libQt5DBus$secondaryArchSuffix
+	devel:libQt5Gui$secondaryArchSuffix
+	devel:libQt5Network$secondaryArchSuffix
+	devel:libQt5PrintSupport$secondaryArchSuffix
+	devel:libQt5WebKit$secondaryArchSuffix
+	devel:libQt5WebKitWidgets$secondaryArchSuffix
+	devel:libQt5Widgets$secondaryArchSuffix
+	devel:libQt5Xml$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:qmake$secondaryArchSuffix
+	cmd:make
+	cmd:g++$secondaryArchSuffix
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:cmake
+	"
+
+BUILD()
+{
+	mkdir -p build
+	cd build
+
+	cmake -DCMAKE_BUILD_TYPE=Release \
+		-DQTONLY=TRUE \
+		-DWITH_DESIGNER_PLUGIN=FALSE \
+		-DCMAKE_INSTALL_PREFIX=$appsDir/Marble \
+		-DMARBLE_DATA_PATH=$appsDir/Marble/data \
+		..
+	# Disable Phonon
+	echo "#undef HAVE_PHONON" > src/lib/marble/config-phonon.h
+	make $jobArgs
+}
+
+INSTALL()
+{
+	cd build
+	make install
+
+	mv $appsDir/Marble/bin/marble-qt $appsDir/Marble/Marble
+
+	rm -rf $appsDir/Marble/bin
+	rm -rf $appsDir/Marble/include
+	rm -rf $appsDir/Marble/share
+
+	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
+	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
+	local MINOR="`echo "$portVersion" | cut -d. -f3`"
+	sed \
+		-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
+		-e "s|@MAJOR@|$MAJOR|" \
+		-e "s|@MIDDLE@|$MIDDLE|" \
+		-e "s|@MINOR@|$MINOR|" \
+		$portDir/additional-files/marble.rdef.in > marble.rdef
+
+
+	addResourcesToBinaries marble.rdef $appsDir/Marble/Marble
+	addAppDeskbarSymlink $appsDir/Marble/Marble
+}
diff --git a/kde-base/marble/marble-4.14.3.recipe b/kde-base/marble/marble-4.14.3.recipe
deleted file mode 100644
index 95b3fa392..000000000
--- a/kde-base/marble/marble-4.14.3.recipe
+++ /dev/null
@@ -1,71 +0,0 @@
-SUMMARY="A virtual globe and world atlas"
-DESCRIPTION="Marble is a geographical atlas and a virtual globe which lets you \
-quickly explore places on our home planet.
-
-You can use Marble to look up addresses, to easily create maps, \
-measure distances and to retrieve detail information about locations \
-that you have just heard about in the news or on the Internet.
-
-The user interface is clean, simple and easy to use."
-HOMEPAGE="http://marble.kde.org"
-COPYRIGHT="2007-2014 by the authors of Marble Virtual Globe"
-LICENSE="GNU LGPL v2.1"
-REVISION="1"
-SOURCE_URI="https://github.com/KDE/marble/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="c4f511865f18cecda7eaa349a2eafb0c2d8b6dac526f59af9a60e9e0199d5a04"
-PATCHES="marble_x86-1.9.2.patchset"
-
-ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	marble$secondaryArchSuffix = $portVersion
-	app:Marble$secondaryArchSuffix = $portVersion
-	"
-REQUIRES="
-	haiku${secondaryArchSuffix}
-	libqt4$secondaryArchSuffix >= 4.8.0
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	libqt4${secondaryArchSuffix}_devel >= 4.8.0
-	"
-BUILD_PREREQUIRES="
-	cmd:qmake$secondaryArchSuffix
-	cmd:make
-	cmd:g++$secondaryArchSuffix
-	cmd:pkg_config$secondaryArchSuffix
-	cmd:cmake
-	"
-
-BUILD()
-{
-	mkdir -p build
-	cd build
-
-	cmake -DCMAKE_BUILD_TYPE=Release \
-		-DQTONLY=TRUE \
-		-DWITH_DESIGNER_PLUGIN=FALSE \
-		-DCMAKE_INSTALL_PREFIX=$appsDir/Marble \
-		-DMARBLE_DATA_PATH=$appsDir/Marble/data \
-		..
-	# Disable Phonon
-	echo "#undef HAVE_PHONON" > src/lib/marble/config-phonon.h
-	make $jobArgs
-}
-
-INSTALL()
-{
-	cd build
-	make install
-
-	mv $appsDir/Marble/bin/marble-qt $appsDir/Marble/Marble
-
-	rm -rf $appsDir/Marble/bin
-	rm -rf $appsDir/Marble/include
-	rm -rf $appsDir/Marble/share
-
-	addResourcesToBinaries ../haiku/marble.rdef $appsDir/Marble/Marble
-	addAppDeskbarSymlink $appsDir/Marble/Marble "Marble"
-}
diff --git a/kde-base/marble/patches/marble_x86-1.9.2.patchset b/kde-base/marble/patches/marble_x86-1.9.2.patchset
deleted file mode 100644
index 57fc8927b..000000000
--- a/kde-base/marble/patches/marble_x86-1.9.2.patchset
+++ /dev/null
@@ -1,149 +0,0 @@
-From 8150e5d4871fe6b6b9ae448ef489f8679c9522c9 Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Tue, 28 Apr 2015 16:15:05 +1000
-Subject: Add Haiku resources
-
-
-diff --git a/haiku/marble.rdef b/haiku/marble.rdef
-new file mode 100644
-index 0000000..959c5ad
---- /dev/null
-+++ b/haiku/marble.rdef
-@@ -0,0 +1,53 @@
-+resource app_signature "application/x-vnd.Marble";
-+resource app_flags B_SINGLE_LAUNCH;
-+resource app_version {
-+	major  = 1,
-+	middle = 9,
-+	minor  = 2,
-+
-+	variety = B_APPV_FINAL,
-+	internal = 0,
-+
-+	short_info = "Marble",
-+	long_info = "Marble is a virtual globe and world atlas"
-+};
-+
-+resource vector_icon array {
-+	$"6E6369660B0400660500020106023ED7763AFA19BA57F33E3CAF490E854834CA"
-+	$"C4D3D8DEE9889199020106023D9BF4325F4EB173883CA01A49E5C24996EFE9D3"
-+	$"D8DEB5889199020106033A1E20370A70B70A703A1E2046F23D4B4BE8DBD3D8DE"
-+	$"9B889199FFFFFFFF020006023C18273C1827BED4133ED4134B6800464FB00087"
-+	$"BDE3FF5299CA020016023C68273C6827BED4133ED4134B4000455F6100FFFFE5"
-+	$"03E63131020116023E60000000000000003D7FFF48C00049000000FFFF010201"
-+	$"12033E71240000000000003DB6674A1EDB4A2000BDFFA478FF00FFFF00020106"
-+	$"033900000000000000003900004740004B00002AFFFFFF77D3D8DEFF88919910"
-+	$"02045C3F5CBABF5CC3F4BF8D54C5CB54B94E54233F23C3F423BABFBF8D2AB94E"
-+	$"2AC5CB2A0204253C25BA5C25C1F3BEC14DB9494DC4384D563C56C1F356BA5CBE"
-+	$"C12BC4382BB9492B0A0CC24BC0EBC443C0EFC386BF9FC2AFBCC5C2AABB8543BB"
-+	$"F3BCF2BC69BB19BC65BBA9BD97BC36C083BC1FC1F1BE02C1720802434C424708"
-+	$"02543A4D3B0802313F2A4008023D343C2F0A064237BF8D323D373ABE5BBF8D48"
-+	$"45BE5B0A0542373D373ABE5BBF8D4845BE5B0A034237BF8D323D37080EBB44BB"
-+	$"E1BB16BC0AB995BBA2BA9ABC79BA6DBCA1B897BC24B8C2BBFFBA44BC69B940BB"
-+	$"93B96ABB6EBAEDBBD8B9E5BB03BA0DBAE1BB44BBE10A0CC6B8C198C607C261C5"
-+	$"D0C246C65CC1A8C5DFC16AC55CC1FDC526C1E2C5A9C14FC501C0FDC473C198C4"
-+	$"3EC17EC4F2C0B90A0AC280BB20C24EBB09C35ABA04C3A6BA27C377BB40C44ABA"
-+	$"70C47DBA87C372BB90C335BB73C368BA3E020BBC5AC291BC5AC291BBF5C201BA"
-+	$"EBC23EBB3FC1EABA97C292BB27C2F3BB0EC2DABB41C30DBB38C34FBB5AC32DBB"
-+	$"05C382BA50C2ECBA83C36FBA50C2ECBA19C322BA19C322BA19C322BAA4C38DBA"
-+	$"53C36FBAF4C3ACBB92C348BB6EC39DBBADC308BB4CC2C0BB65C2DABB32C2A7BB"
-+	$"2DC257BAFDC286BB5CC227BC23C2C8BBEDC233BC23C2C802042F4DB9DB4DB818"
-+	$"4D2B512BC5A42BC7672F55B81855B9DB55335133C76733C5A40005B644C63FB6"
-+	$"44C63FB510C69523C8B723C78F23CA25B72F5DB5885DB8D55D32C8B732CA2532"
-+	$"C84DB9DCC790BA0FC7E9B9DCC790170A00010002402CE9000000000000401861"
-+	$"C086BCC279E70A000100023CE698AEA08A2E300D3C6A6441EA444AC8670A0101"
-+	$"0038201C001501178600040A01010038201C15FF01178400040A020200012020"
-+	$"1C0A03010120201C0A010100023F286B0000000000003F0C304550D740C30C0A"
-+	$"050100023F047D0000000000003EDB6D45DE5043DB6D0A060100023CF2860000"
-+	$"000000003CDB6D487CA1479B6D0A06010220201C0A06040605040338201C15FF"
-+	$"01178000040A06040D0C0B0A28201C15FF0A00010730211D01178322040A0101"
-+	$"0730201C01178322040A06010820201C0A07010920201C0A0801000238CE9800"
-+	$"000000000038492449979448C9240A0901000A3F047D0000000000003EDB6D45"
-+	$"DE5043DB6D15FF0A0901001A3F86820000000000003F5D17433CBCC122EB15FF"
-+	$"01178200040A01010E30201C01178400040A0A010E20201C0A01010F30201C01"
-+	$"178622040A04010F30201C0117822204"
-+};
--- 
-2.2.2
-
-
-From 222a93d5d84422ffc08daa99cff52ec974e25af4 Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Tue, 28 Apr 2015 22:05:00 +1000
-Subject: Fix app signature
-
-
-diff --git a/haiku/marble.rdef b/haiku/marble.rdef
-index 959c5ad..8d01d20 100644
---- a/haiku/marble.rdef
-+++ b/haiku/marble.rdef
-@@ -1,4 +1,4 @@
--resource app_signature "application/x-vnd.Marble";
-+resource app_signature "application/x-vnd.marble-qt";
- resource app_flags B_SINGLE_LAUNCH;
- resource app_version {
- 	major  = 1,
--- 
-2.2.2
-
-
-From 444f018f4bee2ff1727cf363b29b669853f59234 Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Tue, 28 Apr 2015 22:05:32 +1000
-Subject: Fix paths for Haiku
-
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a635544..595fc94 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -250,23 +250,35 @@ else(WIN32)
-       set(plugin_dir ${PLUGIN_INSTALL_DIR}/plugins/marble)
-       set(APPS_INSTALL_DIR ${XDG_APPS_INSTALL_DIR})
-     endif (QTONLY)
--  else(APPLE) # Linux / bsd etc...
--    if (QTONLY)
--      set(data_dir ${CMAKE_INSTALL_PREFIX}/share/marble/data)
--      set(plugin_dir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/marble/plugins)
--      set(CMAKE_MODULES_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/share/marble/cmake)
-+  else(APPLE) 
-+  	if(HAIKU)
-+     set(data_dir ${CMAKE_INSTALL_PREFIX}/data)
-+      set(plugin_dir ${CMAKE_INSTALL_PREFIX}/plugins)
-+      set(CMAKE_MODULES_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/share/cmake)
-       if(NOT ICON_INSTALL_DIR)
-         set(ICON_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/icons)
-       endif(NOT ICON_INSTALL_DIR)
-       if(NOT APPS_INSTALL_DIR)
-         set(APPS_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/applications)
-       endif(NOT APPS_INSTALL_DIR)
--    else (QTONLY)
--      set(data_dir ${DATA_INSTALL_DIR}/marble/data)
--      set(plugin_dir ${PLUGIN_INSTALL_DIR}/plugins/marble)
--      set(CMAKE_MODULES_INSTALL_PATH ${DATA_INSTALL_DIR}/cmake/modules)
--      set(APPS_INSTALL_DIR ${XDG_APPS_INSTALL_DIR})
--    endif (QTONLY)
-+  	else(HAIKU)
-+	    if (QTONLY)
-+	      set(data_dir ${CMAKE_INSTALL_PREFIX}/share/marble/data)
-+	      set(plugin_dir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/marble/plugins)
-+	      set(CMAKE_MODULES_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/share/marble/cmake)
-+	      if(NOT ICON_INSTALL_DIR)
-+	        set(ICON_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/icons)
-+	      endif(NOT ICON_INSTALL_DIR)
-+	      if(NOT APPS_INSTALL_DIR)
-+	        set(APPS_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/applications)
-+	      endif(NOT APPS_INSTALL_DIR)
-+	    else (QTONLY)
-+	      set(data_dir ${DATA_INSTALL_DIR}/marble/data)
-+	      set(plugin_dir ${PLUGIN_INSTALL_DIR}/plugins/marble)
-+	      set(CMAKE_MODULES_INSTALL_PATH ${DATA_INSTALL_DIR}/cmake/modules)
-+	      set(APPS_INSTALL_DIR ${XDG_APPS_INSTALL_DIR})
-+	    endif (QTONLY)
-+    endif(HAIKU)
-   endif(APPLE)
- endif(WIN32)
- 
--- 
-2.2.2
-