diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4
index 2ad3639..19e461a 100644
--- a/ax_init_standard_project.m4
+++ b/ax_init_standard_project.m4
@@ -163,7 +163,10 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
   test -f makefile.in && sed -i '1iEXTRA_DIST = ' makefile.in
   test -f makefile.in && cat >> makefile.in <<EOF
 #### Begin: Appended by $0
-EXTRA_DIST += bootstrap.sh
+EXTRA_DIST += bootstrap.sh ax_init_standard_project.m4 ax_cxx_compile_stdcxx_11.m4 \
+              ax_check_qt.m4 resolve-debbuilddeps.sh resolve-rpmbuilddeps.sh \
+              build-resource-file.sh mac-create-app-bundle.sh
+
 clean-standard-project-targets:
 	-rm -rf \${PACKAGE_NAME}-\${PACKAGE_VERSION}
 	-rm \${PACKAGE_TARNAME}-\${PACKAGE_VERSION}.tar.gz
diff --git a/cordova/makefile.am b/cordova/makefile.am
index 00828a5..7f542f6 100644
--- a/cordova/makefile.am
+++ b/cordova/makefile.am
@@ -3,14 +3,20 @@
 ##       1         2         3         4         5         6         7         8
 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890
 
-EXTRA_DIST = config.xml.in hooks platforms plugins www
+cordova_sources = hooks platforms plugins www
+EXTRA_DIST = config.xml.in ${cordova_sources}
 ANDROID = safechat.apk
 #ANDROID_SRC = platforms/android/build/outputs/apk/android-release-unsigned.apk
 ANDROID_SRC = platforms/android/build/outputs/apk/android-debug.apk
 wwwdir = ${pkgdatadir}/html
 www_DATA = ${ANDROID}
 
-${ANDROID_SRC}: ${EXTRA_DIST}
+${ANDROID_SRC}:
+	for file in ${cordova_sources}; do \
+	  test -e "$${file}" || \
+	    ( cp -r "@srcdir@/$${file}" "$${file}" && \
+	      chmod -R u+w "$${file}" ); \
+	done
 	cordova build --debug
 
 ${ANDROID}: ${ANDROID_SRC}
@@ -19,6 +25,13 @@ ${ANDROID}: ${ANDROID_SRC}
 clean-local:
 	platforms/android/cordova/clean
 	-rm -r platforms/android/.gradle
+	for file in ${cordova_sources}; do \
+	  if test "@srcdir@/$${file}" != "$${file}" \
+                  -a "@srcdir@" != "." \
+                  -a "@srcdir@" != "./"; then \
+	      chmod -R u+w "$${file}" && rm -r "$${file}"; \
+	  fi; \
+	done
 
 CLEANFILES = ${ANDROID} ${ANDROID_SRC}
 MAINTAINERCLEANFILES = makefile.in