diff --git a/Makefile b/Makefile
index b565b3c927954..331bdef285d0a 100644
--- a/Makefile
+++ b/Makefile
@@ -976,21 +976,21 @@ appclean:
 	rm -f data/auto_pickup.txt
 	rm -f data/fontlist.txt
 
-data/osx/AppIcon.icns: data/osx/AppIcon.iconset
+build-data/osx/AppIcon.icns: build-data/osx/AppIcon.iconset
 	iconutil -c icns $<
 
 ifdef OSXCROSS
 app: appclean version $(APPTARGET)
 else
-app: appclean version data/osx/AppIcon.icns $(APPTARGET)
+app: appclean version build-data/osx/AppIcon.icns $(APPTARGET)
 endif
 	mkdir -p $(APPTARGETDIR)/Contents
-	cp data/osx/Info.plist $(APPTARGETDIR)/Contents/
+	cp build-data/osx/Info.plist $(APPTARGETDIR)/Contents/
 	mkdir -p $(APPTARGETDIR)/Contents/MacOS
-	cp data/osx/Cataclysm.sh $(APPTARGETDIR)/Contents/MacOS/
+	cp build-data/osx/Cataclysm.sh $(APPTARGETDIR)/Contents/MacOS/
 	mkdir -p $(APPRESOURCESDIR)
 	cp $(APPTARGET) $(APPRESOURCESDIR)/
-	cp data/osx/AppIcon.icns $(APPRESOURCESDIR)/
+	cp build-data/osx/AppIcon.icns $(APPRESOURCESDIR)/
 	mkdir -p $(APPDATADIR)
 	cp data/fontdata.json $(APPDATADIR)
 	cp -R data/core $(APPDATADIR)
@@ -1047,14 +1047,14 @@ dmgdist: dmgdistclean $(L10N) app
 ifdef OSXCROSS
 	mkdir Cataclysm
 	cp -a $(APPTARGETDIR) Cataclysm/$(APPTARGETDIR)
-	cp data/osx/DS_Store Cataclysm/.DS_Store
-	cp data/osx/dmgback.png Cataclysm/.background.png
+	cp build-data/osx/DS_Store Cataclysm/.DS_Store
+	cp build-data/osx/dmgback.png Cataclysm/.background.png
 	ln -s /Applications Cataclysm/Applications
 	genisoimage -quiet -D -V "Cataclysm DDA" -no-pad -r -apple -o Cataclysm-uncompressed.dmg Cataclysm/
 	dmg dmg Cataclysm-uncompressed.dmg Cataclysm.dmg
 	rm Cataclysm-uncompressed.dmg
 else
-	dmgbuild -s data/osx/dmgsettings.py "Cataclysm DDA" Cataclysm.dmg
+	dmgbuild -s build-data/osx/dmgsettings.py "Cataclysm DDA" Cataclysm.dmg
 endif
 
 endif  # ifeq ($(NATIVE), osx)
diff --git a/data/osx/AppIcon.icns b/build-data/osx/AppIcon.icns
similarity index 100%
rename from data/osx/AppIcon.icns
rename to build-data/osx/AppIcon.icns
diff --git a/data/osx/AppIcon.iconset/icon_1024x1024.png b/build-data/osx/AppIcon.iconset/icon_1024x1024.png
similarity index 100%
rename from data/osx/AppIcon.iconset/icon_1024x1024.png
rename to build-data/osx/AppIcon.iconset/icon_1024x1024.png
diff --git a/data/osx/AppIcon.iconset/icon_128x128.png b/build-data/osx/AppIcon.iconset/icon_128x128.png
similarity index 100%
rename from data/osx/AppIcon.iconset/icon_128x128.png
rename to build-data/osx/AppIcon.iconset/icon_128x128.png
diff --git a/data/osx/AppIcon.iconset/icon_16x16.png b/build-data/osx/AppIcon.iconset/icon_16x16.png
similarity index 100%
rename from data/osx/AppIcon.iconset/icon_16x16.png
rename to build-data/osx/AppIcon.iconset/icon_16x16.png
diff --git a/data/osx/AppIcon.iconset/icon_256x256.png b/build-data/osx/AppIcon.iconset/icon_256x256.png
similarity index 100%
rename from data/osx/AppIcon.iconset/icon_256x256.png
rename to build-data/osx/AppIcon.iconset/icon_256x256.png
diff --git a/data/osx/AppIcon.iconset/icon_32x32.png b/build-data/osx/AppIcon.iconset/icon_32x32.png
similarity index 100%
rename from data/osx/AppIcon.iconset/icon_32x32.png
rename to build-data/osx/AppIcon.iconset/icon_32x32.png
diff --git a/data/osx/AppIcon.iconset/icon_512x512.png b/build-data/osx/AppIcon.iconset/icon_512x512.png
similarity index 100%
rename from data/osx/AppIcon.iconset/icon_512x512.png
rename to build-data/osx/AppIcon.iconset/icon_512x512.png
diff --git a/data/osx/AppIcon.iconset/icon_64x64.png b/build-data/osx/AppIcon.iconset/icon_64x64.png
similarity index 100%
rename from data/osx/AppIcon.iconset/icon_64x64.png
rename to build-data/osx/AppIcon.iconset/icon_64x64.png
diff --git a/data/osx/Cataclysm.sh b/build-data/osx/Cataclysm.sh
old mode 100755
new mode 100644
similarity index 100%
rename from data/osx/Cataclysm.sh
rename to build-data/osx/Cataclysm.sh
diff --git a/data/osx/DS_Store b/build-data/osx/DS_Store
similarity index 100%
rename from data/osx/DS_Store
rename to build-data/osx/DS_Store
diff --git a/data/osx/Info.plist b/build-data/osx/Info.plist
similarity index 100%
rename from data/osx/Info.plist
rename to build-data/osx/Info.plist
diff --git a/data/osx/VolumeIcon.icns b/build-data/osx/VolumeIcon.icns
similarity index 100%
rename from data/osx/VolumeIcon.icns
rename to build-data/osx/VolumeIcon.icns
diff --git a/data/osx/dmgback.png b/build-data/osx/dmgback.png
similarity index 100%
rename from data/osx/dmgback.png
rename to build-data/osx/dmgback.png
diff --git a/data/osx/dmgsettings.py b/build-data/osx/dmgsettings.py
similarity index 100%
rename from data/osx/dmgsettings.py
rename to build-data/osx/dmgsettings.py