diff --git a/src/modules/locale/CMakeLists.txt b/src/modules/locale/CMakeLists.txt
index 94cae2144..6949ccfcc 100644
--- a/src/modules/locale/CMakeLists.txt
+++ b/src/modules/locale/CMakeLists.txt
@@ -18,7 +18,6 @@ calamares_add_plugin(locale
     TYPE viewmodule
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
-        ${geoip_src}
         Config.cpp
         LCLocaleDialog.cpp
         LocaleConfiguration.cpp
@@ -32,8 +31,7 @@ calamares_add_plugin(locale
     RESOURCES
         locale.qrc
     LINK_PRIVATE_LIBRARIES
-        Qt5::Network
-        ${geoip_libs}
+        ${qtname}::Network
         yamlcpp::yamlcpp
     SHARED_LIB
 )
@@ -48,5 +46,5 @@ calamares_add_test(
         SetTimezoneJob.cpp
         timezonewidget/TimeZoneImage.cpp
     DEFINITIONS SOURCE_DIR="${CMAKE_CURRENT_LIST_DIR}/images" DEBUG_TIMEZONES=1
-    LIBRARIES Qt5::Gui
+    LIBRARIES ${qtname}::Gui
 )
diff --git a/src/modules/localeq/CMakeLists.txt b/src/modules/localeq/CMakeLists.txt
index b8ae6a933..1ac8fc9cb 100644
--- a/src/modules/localeq/CMakeLists.txt
+++ b/src/modules/localeq/CMakeLists.txt
@@ -16,10 +16,10 @@ if(DEBUG_TIMEZONES)
     add_definitions(-DDEBUG_TIMEZONES)
 endif()
 
-find_package(Qt5Location CONFIG)
-set_package_properties(Qt5Location PROPERTIES DESCRIPTION "Used for rendering the map" TYPE RUNTIME)
-find_package(Qt5Positioning CONFIG)
-set_package_properties(Qt5Positioning PROPERTIES DESCRIPTION "Used for GeoLocation and GeoCoding" TYPE RUNTIME)
+find_package(${qtname}Location CONFIG)
+set_package_properties(${qtname}Location PROPERTIES DESCRIPTION "Used for rendering the map" TYPE RUNTIME)
+find_package(${qtname}Positioning CONFIG)
+set_package_properties(${qtname}Positioning PROPERTIES DESCRIPTION "Used for GeoLocation and GeoCoding" TYPE RUNTIME)
 
 # Because we're sharing sources with the regular locale module
 set(_locale ${CMAKE_CURRENT_SOURCE_DIR}/../locale)
@@ -38,6 +38,6 @@ calamares_add_plugin(localeq
     RESOURCES
         localeq.qrc
     LINK_PRIVATE_LIBRARIES
-        Qt5::Network
+        ${qtname}::Network
     SHARED_LIB
 )