diff --git a/standalone/android/buildapk b/standalone/android/buildapk
index 4c50cacf04..1d02ffc7dc 100755
--- a/standalone/android/buildapk
+++ b/standalone/android/buildapk
@@ -15,6 +15,7 @@ VER="$(perl -e '$_=<>;print m/\((.*?)\)/'<../../CHANGELOG)"
 
 wrap () {
 	echo "#!/bin/sh -e" > "$2"
+	echo "echo \"$1 added options: $2\" >&2" >> "$2"
 	echo "$1 $3" >> "$2"
 	chmod +x "$2"
 }
@@ -34,10 +35,10 @@ if [ "$androidversion" = 5 ]; then
 			wrap "$src" "$dest" "-pie"
 		;;
 		*-gcc)
-			wrap "$src" "$dest" "-pie" "-fPIE"
+			wrap "$src" "$dest" "-pie -fPIE"
 		;;
 		*'-g++')
-			wrap "$src" "$dest" "-pie" "-fPIE"
+			wrap "$src" "$dest" "-pie -fPIE"
 		;;
 		*)
 			cp -a "$src" "$dest"