diff --git a/makefile b/makefile
index d6629db5e0..2d2029cf04 100755
--- a/makefile
+++ b/makefile
@@ -1605,8 +1605,12 @@ $(build)/android.dep: $(luni-javas) $(libdvm-javas) $(crypto-javas) \
 		$(build)/android/java/lang/reflect/Proxy*
 	cp -r $(build)/android/* $(classpath-build)
 	for x in $(luni-copied-nonjavas); \
-		do cp -f $(luni-java)$${x} $(classpath-build)$${x} ; \
+		do cp $(luni-java)$${x} $(classpath-build)$${x} ; \
 	done
+	# fix security.properties - get rid of "com.android" in front of classes starting with "org"
+	sed -i -e 's/\(.*=\)com\.android\.\(org\..*\)/\1\2/g' \
+		$(classpath-build)/java/security/security.properties
+	chmod +w $(classpath-build)/java/security/security.properties
 	@touch $(@)	
 
 $(test-build)/%.class: $(test)/%.java