diff --git a/core/Makefile b/core/Makefile
index 4088856..02e72b8 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -46,8 +46,8 @@
 	$(hide) echo "#" > $@; \
 	        echo "# ADDITIONAL_DEFAULT_PROPERTIES" >> $@; \
 	        echo "#" >> $@;
-	$(hide) $(foreach line,$(ADDITIONAL_DEFAULT_PROPERTIES), \
-		echo "$(line)" >> $@;)
+	$(hide) echo $(ADDITIONAL_DEFAULT_PROPERTIES) | sed 's/ \([^ ]*=\)/\n\1/g' >> $@;
+	$(hide) echo >> $@
 
 # -----------------------------------------------------------------
 # build.prop
@@ -146,8 +146,8 @@
 		        echo "#" >> $@; \
 		        echo "# ADDITIONAL_BUILD_PROPERTIES" >> $@; \
 		        echo "#" >> $@; )
-	$(hide) $(foreach line,$(ADDITIONAL_BUILD_PROPERTIES), \
-		echo "$(line)" >> $@;)
+	$(hide) echo $(ADDITIONAL_BUILD_PROPERTIES) | sed 's/ \([^ ]*=\)/\n\1/g' >> $@;
+	$(hide) echo >> $@
 
 build_desc :=