diff --git a/android.pri b/android.pri
index 2355bc93486e9c81ffedf52d0c9c71ce2964c11b..3962196ca46aac31ef15ade08889f15e44944227 100644
--- a/android.pri
+++ b/android.pri
@@ -15,7 +15,7 @@ exists($$PWD/custom/android) {
     android_source_dir_target.commands = $$QMAKE_MKDIR $$ANDROID_PACKAGE_SOURCE_DIR && \
             $$QMAKE_COPY_DIR $$PWD/android/* $$OUT_PWD/ANDROID_PACKAGE_SOURCE_DIR && \
             $$QMAKE_COPY_DIR $$PWD/custom/android/* $$OUT_PWD/ANDROID_PACKAGE_SOURCE_DIR && \
-            $$QMAKE_STREAM_EDITOR -i \"s/package="org.mavlink.qgroundcontrol"/package=\"$$QGC_ORG_DOMAIN.qgroundcontrol\"/\" $$ANDROID_PACKAGE_SOURCE_DIR/AndroidManifest.xml
+            $$QMAKE_STREAM_EDITOR -i \"s/package=\\\"org.mavlink.qgroundcontrol\\\"/package=\\\"$$QGC_ANDROID_PACKAGE\\\"/\" $$ANDROID_PACKAGE_SOURCE_DIR/AndroidManifest.xml
     android_source_dir_target.depends = FORCE
 }
 
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index c3571cac7bd067f1dca247a0f1491ad8e7f81503..46bebf0fa6d046211ef22bf89637b85d5e2cd5f4 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -82,4 +82,3 @@
     <!-- %%INSERT_FEATURES -->
 
 </manifest>
-