diff --git a/Makefile b/Makefile
index 2afe8fc0e..5f84ba09e 100644
--- a/Makefile
+++ b/Makefile
@@ -21,26 +21,7 @@ data/data.js: \
 	data/discarded.json \
 	data/imagery.json \
 	data/keys.json
-	echo 'iD.data = {' > $@
-	echo 'deprecated: ' >> $@
-	cat data/deprecated.json >> $@
-	echo ', discarded: ' >> $@
-	cat data/discarded.json >> $@
-	echo ', imagery: ' >> $@
-	cat data/imagery.json >> $@
-	echo ', keys: ' >> $@
-	cat data/keys.json >> $@
-	echo ', presets: {' >> $@
-	echo 'presets: ' >> $@
-	cat data/presets/presets.json >> $@
-	echo ', defaults: ' >> $@
-	cat data/presets/defaults.json >> $@
-	echo ', categories: ' >> $@
-	cat data/presets/categories.json >> $@
-	echo ', forms: ' >> $@
-	cat data/presets/forms.json >> $@
-	echo '}' >> $@
-	echo '};' >> $@
+	node data/make.js
 
 .INTERMEDIATE iD.js: \
 	js/lib/bootstrap-tooltip.js \
diff --git a/data/make.js b/data/make.js
new file mode 100644
index 000000000..1759b75b8
--- /dev/null
+++ b/data/make.js
@@ -0,0 +1,16 @@
+var fs = require('fs');
+
+function r(f) { return JSON.parse(fs.readFileSync(__dirname + '/' + f)); }
+function rp(f) { return r('presets/' + f); }
+
+fs.writeFileSync('data.js', 'iD.data = ' + JSON.stringify({
+    deprecated: r('deprecated.json'),
+    discarded: r('discarded.json'),
+    keys: r('keys.json'),
+    presets: {
+        presets: rp('presets.json'),
+        defaults: rp('defaults.json'),
+        categories: rp('categories.json'),
+        forms: rp('forms.json')
+    }
+}));