diff --git a/data/Makefile.raw b/data/Makefile.raw
index 4c975e00c..ec1cb5031 100644
--- a/data/Makefile.raw
+++ b/data/Makefile.raw
@@ -1,8 +1,5 @@
 SUBDIRS=mods
 
-$(SUBDIRS):
-	$(MAKE) -f Makefile.raw -C $@ $(MAKECMDGOALS)
-
 MAKERULES=../makerules
 include $(MAKERULES)/configure.mk
 
@@ -20,6 +17,9 @@ ifdef DATA
 all: $(BASEARCHIVE) $(PATCHARCHIVE) $(SUBDIRS)
 endif
 
+$(SUBDIRS):
+	$(MAKE) -f Makefile.raw -C $@ $(MAKECMDGOALS)
+
 $(BASEARCHIVE): $(BASELIST)
 	zip -ru0 $@ $(BASELIST) -x *svn*
 	zip -T $@
diff --git a/nsis/warzone2100.nsi b/nsis/warzone2100.nsi
index 5e3337d0b..feeb09202 100755
--- a/nsis/warzone2100.nsi
+++ b/nsis/warzone2100.nsi
@@ -196,7 +196,7 @@ Section $(TEXT_SecGrimMod) SecGrimMod
 
   SetOutPath "$INSTDIR\mods\global"
 
-  File "..\data\grim.wz"
+  File "..\data\mods\global\grim.wz"
 
   SetOutPath "$INSTDIR"
 
diff --git a/nsis/warzone2100.update.nsi b/nsis/warzone2100.update.nsi
index 41becad88..c1bb15159 100644
--- a/nsis/warzone2100.update.nsi
+++ b/nsis/warzone2100.update.nsi
@@ -207,7 +207,7 @@ Section $(TEXT_SecGrimMod) SecGrimMod
 
   SetOutPath "$INSTDIR\mods\global"
 
-;  File "..\data\grim.wz"
+;  File "..\data\mods\global\grim.wz"
 ;  !insertmacro VPatchFile "grim.wz.vpatch" "$INSTDIR\grim.wz" "$INSTDIR\grim.wz.tmp"
 
   SetOutPath "$INSTDIR"