diff --git a/build/SConscript.install b/build/SConscript.install
index eaccdef4..0aab4106 100644
--- a/build/SConscript.install
+++ b/build/SConscript.install
@@ -122,7 +122,9 @@ elif sys.platform == 'darwin':
 
 if dist:
 	if sys.platform == 'win32':
-		distTarget = env.Command("Mitsuba %s.zip" % MTS_VERSION, [], "#data\\windows\\build-dist.bat %s" % MTS_VERSION)
+		bits = 64 if 'WIN64' in env['CXXFLAGS'] else 32
+		distCommand = env.GetBuildPath('#data/windows/build-dist.bat')
+		distTarget = env.Command("Mitsuba %s %ibit.zip" % (MTS_VERSION, bits), [], "%s %s %i" % (distCommand, MTS_VERSION, bits))
 		Depends(distTarget, installTargets)
 	elif sys.platform == 'darwin':
 		distTarget = env.Command("Mitsuba %s.dmg" % MTS_VERSION, [], "#data/darwin/build-dmg.sh %s" % MTS_VERSION)
diff --git a/data/windows/build-dist.bat b/data/windows/build-dist.bat
index 70b5cbd1..be847428 100644
--- a/data/windows/build-dist.bat
+++ b/data/windows/build-dist.bat
@@ -1,5 +1,5 @@
 @echo off
 xcopy dist "Mitsuba %1" /e /i /h
 del "Mitsuba %1.zip"
-7z u -tzip "Mitsuba %1.zip" "Mitsuba %1"
+7z u -tzip "Mitsuba %1 %2bit.zip" "Mitsuba %1"
 rmdir /s /q "Mitsuba %1"