diff --git a/do_not_build_qtonly_and_mobile.diff b/do_not_build_qtonly_and_mobile.diff
deleted file mode 100644
index d65473d..0000000
--- a/do_not_build_qtonly_and_mobile.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: src/apps/CMakeLists.txt
-===================================================================
---- src/apps/CMakeLists.txt.orig	2014-03-31 09:51:15.000000000 +0200
-+++ src/apps/CMakeLists.txt	2014-04-25 22:22:29.253322142 +0200
-@@ -1,6 +1,4 @@
- add_subdirectory(marble-ui)
--add_subdirectory(marble-qt)
--add_subdirectory(marble-mobile)
- 
- if (NOT QTONLY)
-   add_subdirectory(marble-kde)
diff --git a/libmarblewidget.changes b/libmarblewidget.changes
new file mode 100644
index 0000000..d2f9c07
--- /dev/null
+++ b/libmarblewidget.changes
@@ -0,0 +1,14 @@
+-------------------------------------------------------------------
+Sun Sep 13 19:43:47 UTC 2015 - tittiatcoke@gmail.com
+
+- Update to KDE Applications 15.08.1
+   * KDE Applications 15.08.1 
+   * https://www.kde.org/announcements/announce-applications-15.08.1.php
+
+- Drop upstream patch marble_fix_ppc64_build.patch
+-------------------------------------------------------------------
+Sun Aug 30 18:20:17 UTC 2015 - tittiatcoke@gmail.com
+
+- Initial package to fullfil the buildrequirements for libkgeomap
+  as it is still based on Qt4
+
diff --git a/libmarblewidget.spec b/libmarblewidget.spec
new file mode 100644
index 0000000..010d017
--- /dev/null
+++ b/libmarblewidget.spec
@@ -0,0 +1,89 @@
+#
+# spec file for package libmarblewidget
+#
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+%define _so 22
+
+Name:           libmarblewidget
+Version:        15.08.1
+Release:        0
+Summary:        Generic map viewer library for libkgeomapr
+License:        LGPL-2.1+
+Group:          Amusements/Teaching/Other
+Url:            http://edu.kde.org
+Source0:        marble-%{version}.tar.xz
+BuildRequires:  fdupes
+BuildRequires:  gpsd-devel
+BuildRequires:  perl
+BuildRequires:  libkde4-devel
+BuildRequires:  quazip-devel
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+
+%description
+The shared library for the MarbleWidget shared library.
+
+%package devel
+Summary:        Generic map viewer: Build Environment
+Group:          Development/Libraries/KDE
+Requires:       libmarblewidget%{_so} = %{version}
+Conflicts:      marble-devel
+
+%description devel
+Development headers and libraries for Marble.
+
+%package -n libmarblewidget%{_so}
+Summary:        Generic map viewer: Shared Library
+Group:          Development/Libraries/KDE
+
+%description -n libmarblewidget%{_so}
+The shared library for the MarbleWidget shared library.
+
+%prep
+%setup -q -n marble-%{version}
+
+%build
+%ifarch ppc ppc64
+export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
+%endif
+%cmake_kde4 -d build -- -DQT5BUILD=OFF
+cd src/lib/marble
+make 
+
+%install
+  pushd build/src/lib/marble
+  %kde4_makeinstall
+  popd
+  mkdir -p %{buildroot}%{_kde4_appsdir}/cmake/modules
+  cp build/FindMarble.cmake %{buildroot}%{_kde4_appsdir}/cmake/modules/
+  %fdupes -s %{buildroot}
+
+%post   -n libmarblewidget%{_so} -p /sbin/ldconfig
+
+%postun -n libmarblewidget%{_so} -p /sbin/ldconfig
+
+%files devel
+%defattr(-,root,root)
+%doc BUGS CODING
+%{_includedir}/marble/
+%{_libdir}/libmarblewidget.so
+%{_kde4_appsdir}/cmake/modules/FindMarble.cmake
+
+%files -n libmarblewidget%{_so} 
+%defattr(-,root,root)
+%doc CREDITS ChangeLog COPYING* LICENSE* MANIFESTO.txt
+%{_libdir}/libmarblewidget.so.*
+
+%changelog
diff --git a/marble-15.04.3.tar.xz b/marble-15.04.3.tar.xz
deleted file mode 100644
index d55ee9b..0000000
--- a/marble-15.04.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5aa065a8271df5f2ef594d8a8cc2985223b1f009a06f1ad569e17ee4b2724bba
-size 23054680
diff --git a/marble-15.08.1.tar.xz b/marble-15.08.1.tar.xz
new file mode 100644
index 0000000..4dd4c46
--- /dev/null
+++ b/marble-15.08.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7248b2f1dcaac1f6819f2749654c10c44e790a578f03aeebaec33a2661c8a037
+size 23273312
diff --git a/marble.changes b/marble.changes
index 02ee3e5..325c62e 100644
--- a/marble.changes
+++ b/marble.changes
@@ -1,3 +1,43 @@
+-------------------------------------------------------------------
+Sun Sep 13 19:43:47 UTC 2015 - tittiatcoke@gmail.com
+
+- Update to KDE Applications 15.08.1
+   * KDE Applications 15.08.1 
+   * https://www.kde.org/announcements/announce-applications-15.08.1.php
+
+- Drop upstream patch marble_fix_ppc64_build.patch
+-------------------------------------------------------------------
+Sat Aug 29 18:27:03 UTC 2015 - tittiatcoke@gmail.com
+
+- Switch back to Qt4 build for Marble so that other dependencies 
+  can be build too
+
+-------------------------------------------------------------------
+Wed Aug 19 19:44:22 UTC 2015 - cgiboudeaux@gmx.com
+
+- Update to KDE Applications 15.08.0
+   * KDE Applications 15.08.0
+   * https://www.kde.org/announcements/announce-applications-15.08.0.php
+
+-------------------------------------------------------------------
+Wed Aug 19 11:09:31 UTC 2015 - cgiboudeaux@gmx.com
+
+- Add marble_fix_ppc64_build.patch. Fixes the ppc64 installation paths
+- Move FindMarble.cmake to marble-devel
+- Spec cleanup
+
+-------------------------------------------------------------------
+Fri Aug  7 07:04:33 UTC 2015 - tittiatcoke@gmail.com
+
+- Update to KDE Applications 15.07.90
+   * KDE Applications 15.08.0 RC1
+   * https://www.kde.org/announcements/announce-applications-15.07.90.php
+   * Marble is now Qt5/KF5 based
+
+- Drop patch  do_not_build_qtonly_and_mobile.diff which is no 
+  longer required
+
+
 -------------------------------------------------------------------
 Mon Jul  6 05:33:45 UTC 2015 - tittiatcoke@gmail.com
 
diff --git a/marble.spec b/marble.spec
index c2755e2..6d39f63 100644
--- a/marble.spec
+++ b/marble.spec
@@ -15,43 +15,83 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
-%define _so 21
+%define _so -22
 
 Name:           marble
-Version:        15.04.3
+Version:        15.08.1
 Release:        0
 Summary:        Generic map viewer
 License:        LGPL-2.1+
 Group:          Amusements/Teaching/Other
 Url:            http://edu.kde.org
 Source0:        %{name}-%{version}.tar.xz
-# PATCH-FIX-OPENSUSE do_not_build_qtonly_and_mobile.diff do not build qt-only version and mobile version
-Patch0:         do_not_build_qtonly_and_mobile.diff
 BuildRequires:  fdupes
 BuildRequires:  gpsd-devel
-BuildRequires:  libkde4-devel
 BuildRequires:  perl
-BuildRequires:  quazip-devel
-BuildRequires:  xz
+BuildRequires:  kconfig-devel
+BuildRequires:  pkgconfig(Qt5Core) >= 5.2.0
+BuildRequires:  pkgconfig(Qt5Xml) >= 5.2.0
+BuildRequires:  pkgconfig(Qt5Network) >= 5.2.0
+BuildRequires:  pkgconfig(Qt5Test) >= 5.2.0
+BuildRequires:  pkgconfig(Qt5Script) >= 5.2.0
+BuildRequires:  pkgconfig(Qt5Widgets) >= 5.2.0
+BuildRequires:  pkgconfig(Qt5WebKitWidgets) >= 5.2.0
+BuildRequires:  pkgconfig(Qt5Svg) >= 5.2.0
+BuildRequires:  pkgconfig(Qt5Sql) >= 5.2.0
+BuildRequires:  pkgconfig(Qt5Concurrent) >= 5.2.0
+BuildRequires:  pkgconfig(Qt5PrintSupport) >= 5.2.0
+BuildRequires:  pkgconfig(Qt5Quick) >= 5.2.0
+BuildRequires:  pkgconfig(Qt5OpenGL) >= 5.2.0
+BuildRequires:  pkgconfig(Qt5DBus) >= 5.2.0
+BuildRequires:  pkgconfig(Qt5SerialPort) >= 5.2.0
+BuildRequires:  pkgconfig(Qt5Designer) >= 5.2.0
+BuildRequires:  kf5-filesystem
+BuildRequires:  extra-cmake-modules
+BuildRequires:  kwallet-devel
+BuildRequires:  knewstuff-devel
+BuildRequires:  kparts-devel
+BuildRequires:  kcoreaddons-devel
+BuildRequires:  kdoctools-devel
+BuildRequires:  ki18n-devel
+BuildRequires:  phonon4qt5-devel
+BuildRequires:  kservice-devel
+BuildRequires:  krunner-devel
+BuildRequires:  libquazip-qt5-devel
+Requires:       libmarblewidget-qt5%{_so} = %{version}
 Requires:       %{name}-data = %{version}
 Requires:       libastro1 = %{version}
-Requires:       libmarblewidget%{_so} = %{version}
+Requires:       marble-frontend = %{version}
 Recommends:     %{name}-doc = %{version}
-Provides:       kde4-marble = 4.3.0
-Obsoletes:      kde4-marble < 4.3.0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%kde4_runtime_requires
 
 %description
 Marble is a viewer of map data.
 
+%package qt
+Summary:        Qt Frontend for Marble
+Group:          Amusements/Teaching/Other
+Requires:       %{name} = %{version}
+Provides:       marble-frontend = %{version}
+Conflicts:      otherproviders(marble-frontend)
+
+%description qt
+The Qt frontend for the Marble map viewer
+
+%package kde
+Summary:        The KDE optimized frontend for Marble
+Group:          Amusements/Teaching/Other
+Requires:       %{name} = %{version}
+Provides:       marble-frontend = %{version}
+Conflicts:      otherproviders(marble-frontend)
+Supplements:    packageand(marble:plasma5-desktop)
+
+%description kde
+The KDE frontend for the Marble map viewer
+
 %package data
 Summary:        Generic map viewer: data
 Group:          Amusements/Teaching/Other
 Requires:       %{name} = %{version}
-Provides:       kde4-marble-data = 4.3.0
-Obsoletes:      kde4-marble-data < 4.3.0
 BuildArch:      noarch
 
 %description data
@@ -60,9 +100,8 @@ Marble is a viewer of map data. This package contains its data.
 %package devel
 Summary:        Generic map viewer: Build Environment
 Group:          Development/Libraries/KDE
-Requires:       libmarblewidget%{_so} = %{version}
-Provides:       kde4-marble-devel = 4.3.0
-Obsoletes:      kde4-marble-devel < 4.3.0
+Requires:       libmarblewidget-qt5%{_so} = %{version}
+Requires:       libastro1 = %{version}
 
 %description devel
 Development headers and libraries for Marble.
@@ -76,11 +115,11 @@ BuildArch:      noarch
 %description doc
 Marble is a viewer of map data. This package contains its documentation.
 
-%package -n libmarblewidget%{_so}
+%package -n libmarblewidget-qt5%{_so}
 Summary:        Generic map viewer: Shared Library
 Group:          Development/Libraries/KDE
 
-%description -n libmarblewidget%{_so}
+%description -n libmarblewidget-qt5%{_so}
 The shared library for the MarbleWidget shared library.
 
 %package -n libastro1
@@ -92,26 +131,44 @@ The Astronomy shared library for the MarbleWidget shared library.
 
 %prep
 %setup -q
-%patch0
 
 %build
 %ifarch ppc ppc64
 export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
 %endif
-  %cmake_kde4 -d build
-  %make_jobs
+
+export SUSE_ASNEEDED=0
+mkdir build
+pushd build
+cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \
+      -DCMAKE_INSTALL_PREFIX=%{_kf5_prefix} \
+      -DCMAKE_PREFIX_PATH=%{_kf5_prefix} \
+      -DKDE_INSTALL_LIBDIR=%{_lib} \
+      -DKDE_INSTALL_SYSCONFDIR=%{_kf5_sysconfdir} \
+      -DKDE_INSTALL_QTPLUGINDIR=%{_lib}/qt5/plugins \
+      -DKDE_INSTALL_PLUGINDIR=%{_lib}/qt5/plugins \
+      -DKDE_INSTALL_QMLDIR=%{_lib}/qt5/qml \
+      -DKDE_INSTALL_QTQUICKIMPORTSDIR=%{_lib}/qt5/imports \
+      -DECM_MKSPECS_INSTALL_DIR=%{_kf5_mkspecsdir} \
+      -DBUILD_TESTING=OFF \
+      -DBUILD_MARBLE_TESTS=NO \
+      -DWITH_KF5=TRUE \
+      ..
+%make_jobs
 
 %install
-  %kde4_makeinstall -C build
-  %kde_post_install
+  %kf5_makeinstall -C build
+  %fdupes -s %{buildroot}
+  rm -rf %{buildroot}%{_kf5_applicationsdir}/marble-mobile.desktop
+  rm -rf %{buildroot}%{_kf5_applicationsdir}/marble-touch.desktop
+  rm -rf %{buildroot}/designer
+  rm -rf %{buildroot}%{_kf5_bindir}/marble-mobile
+  rm -rf %{buildroot}%{_kf5_bindir}/marble-touch
   %fdupes -s %{buildroot}
 
-#remove additional desktop files as they cause multiple non distinguishable entries in the homerun (https://bugs.kde.org/show_bug.cgi?id=327405#c8) or even a single random entry in kickoff
-  rm -rf %{buildroot}/usr/share/applications/kde4/marble-touch.desktop
+%post   -n libmarblewidget-qt5%{_so} -p /sbin/ldconfig
 
-%post   -n libmarblewidget%{_so} -p /sbin/ldconfig
-
-%postun -n libmarblewidget%{_so} -p /sbin/ldconfig
+%postun -n libmarblewidget-qt5%{_so} -p /sbin/ldconfig
 
 %post   -n libastro1 -p /sbin/ldconfig
 
@@ -120,58 +177,59 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
 %files
 %defattr(-,root,root)
 %doc CREDITS ChangeLog COPYING* LICENSE* MANIFESTO.txt
-%dir %{_kde4_datadir}/appdata
-%dir %{_kde4_libdir}/qt4/plugins/imports/org
-%dir %{_kde4_libdir}/qt4/plugins/imports/org/kde/
-%dir %{_kde4_libdir}/qt4/plugins/imports/org/kde/edu/
-%exclude %{_kde4_appsdir}/marble/data
-%{_kde4_applicationsdir}/marble.desktop
-%{_kde4_applicationsdir}/marble_gpx.desktop
-%{_kde4_applicationsdir}/marble_kml.desktop
-%{_kde4_applicationsdir}/marble_osm.desktop
-%{_kde4_applicationsdir}/marble_kmz.desktop
-%{_kde4_applicationsdir}/marble_geo.desktop
-%{_kde4_applicationsdir}/marble_worldwind.desktop
-%{_kde4_appsdir}/marble/
-%{_kde4_bindir}/marble*
-#{_kde4_bindir}/routing-instructions
-#{_kde4_bindir}/tilecreator
-%{_kde4_configkcfgdir}/marble.kcfg
-%{_kde4_datadir}/appdata/marble.appdata.xml
-%{_kde4_datadir}/mime/packages/geo.xml
-%{_kde4_iconsdir}/hicolor/*/apps/marble.*
-%{_kde4_libdir}/qt4/plugins/imports/org/kde/edu/marble/
-%{_kde4_modulesdir}/libmarble_part.so
-%{_kde4_modulesdir}/marblethumbnail.so
-%{_kde4_modulesdir}/plasma_applet_worldclock.so
-%{_kde4_modulesdir}/plasma_runner_marble.so
-%{_kde4_modulesdir}/plugins/designer/*
-%{_kde4_modulesdir}/plugins/marble/
-%{_kde4_servicesdir}/*.desktop
+%dir %{_kf5_libdir}/plugins/
+%exclude %{_kf5_sharedir}/marble/data
+%exclude %{_kf5_sharedir}/marble/cmake
+%{_kf5_applicationsdir}/marble_geo.desktop
+%{_kf5_applicationsdir}/marble_gpx.desktop
+%{_kf5_applicationsdir}/marble_kml.desktop
+%{_kf5_applicationsdir}/marble_kmz.desktop
+%{_kf5_applicationsdir}/marble_osm.desktop
+%{_kf5_applicationsdir}/marble_worldwind.desktop
+%{_kf5_configkcfgdir}/
+%{_kf5_iconsdir}/hicolor/*/apps/marble.*
+%{_kf5_kxmlguidir}/marble/
+%{_kf5_libdir}/marble/
+%{_kf5_libdir}/plugins/designer/
+%{_kf5_plugindir}/libmarble*so
+%{_kf5_plugindir}/plasma_runner_marble.so
+%{_kf5_servicesdir}/*desktop
+%{_kf5_sharedir}/appdata/
+%{_kf5_sharedir}/marble/
 
 %files devel
 %defattr(-,root,root)
 %doc BUGS CODING
 %{_includedir}/marble/
 %{_includedir}/astro/
-%{_kde4_libdir}/libmarblewidget.so
-%{_kde4_libdir}/libastro.so
-%{_kde4_appsdir}/cmake/modules/FindMarble.cmake
+%{_kf5_libdir}/libmarblewidget-qt5.so
+%{_kf5_libdir}/libastro.so
+%{_kf5_sharedir}/marble/cmake/
 
 %files data
 %defattr(-,root,root)
-%{_kde4_appsdir}/marble/data
+%{_kf5_sharedir}/marble/data
 
 %files doc
 %defattr(-,root,root)
-%{_kde4_htmldir}/en/marble/
+%{_kf5_htmldir}/en/marble/
 
-%files -n libmarblewidget%{_so}
+%files -n libmarblewidget-qt5%{_so}
 %defattr(-,root,root)
-%{_kde4_libdir}/libmarblewidget.so.*
+%{_kf5_libdir}/libmarblewidget-qt5.so.*
 
 %files -n libastro1
 %defattr(-,root,root)
-%{_kde4_libdir}/libastro.so.*
+%{_kf5_libdir}/libastro.so.*
+
+%files qt
+%defattr(-,root,root)
+%{_kf5_applicationsdir}/marble-qt.desktop
+%{_kf5_bindir}/marble-qt
+
+%files kde
+%defattr(-,root,root)
+%{_kf5_applicationsdir}/marble.desktop
+%{_kf5_bindir}/marble
 
 %changelog