Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -427,7 +427,7 @@
     set(EXPORT_DIR "${CMAKE_BINARY_DIR}/android/kstars_build_apk/")
     set(ANDROID_APK_DIR "${CMAKE_SOURCE_DIR}/android/apk/")
     set(EXECUTABLE_DESTINATION_PATH "${EXPORT_DIR}/libs/armeabi-v7a/libkstars.so")
-    set(ANDROID_NDK $ENV{ANDROID_NDK})
+    set(ANDROID_NDK $ENV{CMAKE_ANDROID_NDK})
     set(ANDROID_SDK_ROOT $ENV{ANDROID_SDK_ROOT})
     set(ANDROID_API_LEVEL $ENV{ANDROID_API_LEVEL})
     set(ANDROID_TOOLCHAIN arm-linux-androideabi)
Index: android/build_kf5.sh
===================================================================
--- android/build_kf5.sh
+++ android/build_kf5.sh
@@ -33,7 +33,7 @@
 
 if [ -e $qt_android_libs ]
 then
-    sed -E -i "s|-DCMAKE_PREFIX_PATH=.*?\\ |-DCMAKE_PREFIX_PATH=$QT_ANDROID -DECM_ADDITIONAL_FIND_ROOT_PATH=$QT_ANDROID\;$CURDIR/kf5/kde/install -DANDROID_STL=gnustl_static |g" kdesrc-conf-android/kdesrc-buildrc
+    sed -E -i "s|-DCMAKE_PREFIX_PATH=.*?\\ |-DCMAKE_PREFIX_PATH=$QT_ANDROID- -DCMAKE_ANDROID_NDK=$CMAKE_ANDROID_NDK -DECM_ADDITIONAL_FIND_ROOT_PATH=$QT_ANDROID\;$CURDIR/kf5/kde/install -DANDROID_STL=gnustl_static |g" kdesrc-conf-android/kdesrc-buildrc
 else
     echo "Qt Android libraries path doesn't exist. Exiting."
     exit
@@ -47,7 +47,6 @@
 ./kdesrc-build libintl-lite extra-cmake-modules frameworks-android
 
 # Fix some config files
-sed -i '/find_package(Gettext/ s/^/#/' kde/install/lib/cmake/KFke
 sed -i '/find_package(PythonInterp/ s/^/#/' kde/install/lib/cmake/KF5I18n/KF5I18NMacros.cmake
 sed -i '/find_dependency(Qt5Xml/ s/^/#/' kde/install/lib/cmake/KF5Config/KF5ConfigConfig.cmake
 #sed -i '/cxx_decltype/ s/^/#/' ${QT_ANDROID}/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake