diff --git a/recipes-application/plasma-mobile/koko.inc b/recipes-application/plasma-mobile/koko.inc
index 2c8fcbc..938dfc4 100644
--- a/recipes-application/plasma-mobile/koko.inc
+++ b/recipes-application/plasma-mobile/koko.inc
@@ -37,21 +37,17 @@ KOKO_CITIES1000="cities1000.zip"
 KOKO_ADMIN1CODES="admin1CodesASCII.txt"
 KOKO_ADMIN2CODES="admin2Codes.txt"
 
-SRC_URI:append = " http://download.geonames.org/export/dump/${KOKO_CITIES1000};name=cities1000;unpack=0 \
-http://download.geonames.org/export/dump/${KOKO_ADMIN1CODES};name=admin1Codes \
-http://download.geonames.org/export/dump/${KOKO_ADMIN2CODES};name=admin2Codes \
-"
-
-SRC_URI[cities1000.sha256sum] = "9a355b83ab7d6e188e5e3f32d2ae0324100cb94822ca2b972a02ca0e3279b590"
-SRC_URI[admin1Codes.sha256sum] = "4fd9666062869d462f6beaebdc35467601b05becc48d5914a333bfa9e584bb24"
-SRC_URI[admin2Codes.sha256sum] = "e7f41100cdd4154bf8e1217e5200c65e9386fb92adf8662a8117845c347908c3"
+SRC_URI:append = " git://invent.kde.org/packaging/geonames-data.git;prototol=https;name=geodata;nobranch=1;destsuffix=geonames-data;rev=608af80ddf04265496eccd0c63b2945042cdccdc"
 
 # To build Koko, it is required to import a few files from outside
 # this repository. These files are licensed under the CC-BY-4.0 and
 # are maintained by the GeoNames project. These files need to be
 # copied to the src directory. CMake will take care of the rest.
 do_configure:prepend() {
-    cp ${WORKDIR}/${KOKO_CITIES1000} ${S}/src
-    cp ${WORKDIR}/${KOKO_ADMIN1CODES} ${S}/src
-    cp ${WORKDIR}/${KOKO_ADMIN2CODES} ${S}/src
+    # compatibility workaround for Yocto versions older than Styhead
+    [ -z ${UNPACKDIR+x} ] && UNPACKDIR=${WORKDIR}
+
+    cp ${UNPACKDIR}/geonames-data/export/${KOKO_CITIES1000} ${S}/src
+    cp ${UNPACKDIR}/geonames-data/export/${KOKO_ADMIN1CODES} ${S}/src
+    cp ${UNPACKDIR}/geonames-data/export/${KOKO_ADMIN2CODES} ${S}/src
 }