diff --git a/recipes-hawaii/hawaii-system-preferences/hawaii-system-preferences_0.3.0.bb b/recipes-hawaii/hawaii-system-preferences/hawaii-system-preferences_0.3.0.bb
deleted file mode 100644
index 1e8a2816..00000000
--- a/recipes-hawaii/hawaii-system-preferences/hawaii-system-preferences_0.3.0.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-SUMMARY = "System preferences for the Hawaii desktop environment"
-LICENSE = "GPLv2 & LGPLv2.1"
-LIC_FILES_CHKSUM = " \
-	file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-	file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
-"
-
-inherit cmake_qt5
-
-# TBD: libhawaii is already marekd as abandoned
-DEPENDS = "qtbase qtdeclarative qtquickcontrols polkit-qt-1 qtconfiguration libhawaii hawaii-shell qtaccountsservice qttools extra-cmake-modules-native"
-
-SRC_URI = "git://github.com/hawaii-desktop/${BPN}.git;protocol=git;branch=master"
-SRCREV = "4f7aaed8fe5ace9d5efcdec160c963ff101c845f"
-S = "${WORKDIR}/git"
-
-EXTRA_OECMAKE += "-DQt5LinguistTools_DIR=${STAGING_LIBDIR_NATIVE}/cmake/Qt5LinguistTools"
-
-FILES_${PN} += "${libdir}/hawaii ${datadir}/hawaii"
-FILES_${PN}-dbg += "${libdir}/hawaii/qml/Hawaii/SystemPreferences/Background/.debug"
diff --git a/recipes-hawaii/hawaii-system-preferences/hawaii-system-preferences_git.bb b/recipes-hawaii/hawaii-system-preferences/hawaii-system-preferences_git.bb
new file mode 100644
index 00000000..4e330bf7
--- /dev/null
+++ b/recipes-hawaii/hawaii-system-preferences/hawaii-system-preferences_git.bb
@@ -0,0 +1,25 @@
+SUMMARY = "System preferences for the Hawaii desktop environment"
+LICENSE = "GPLv2 & LGPLv2.1"
+LIC_FILES_CHKSUM = " \
+	file://LICENSE.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+	file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c \
+"
+
+inherit cmake_qt5
+
+DEPENDS = "qtbase qtdeclarative qtquickcontrols polkit-qt-1 extra-cmake-modules-native kscreen"
+
+SRC_URI = "git://github.com/hawaii-desktop/${BPN}.git;protocol=git;branch=master"
+SRCREV = "e60b281d6aad847802f1bf0aaa08f41eed1533a8"
+PV = "0.4.0+git${SRCPV}"
+S = "${WORKDIR}/git"
+
+EXTRA_OECMAKE += "-DQt5LinguistTools_DIR=${STAGING_LIBDIR_NATIVE}/cmake/Qt5LinguistTools"
+
+FILES_${PN} += " \
+    ${libdir}/qml \
+"
+
+FILES_${PN}-dbg += " \
+    ${libdir}/qml/org/hawaii/systempreferences/*/.debug \
+"