diff --git a/packaging/linux/deb/DEBIAN/control b/packaging/linux/deb/DEBIAN/control
index b8dec8ad9e..4865d8731f 100644
--- a/packaging/linux/deb/DEBIAN/control
+++ b/packaging/linux/deb/DEBIAN/control
@@ -1,7 +1,7 @@
 Package: openra
 Version: {VERSION}
 Architecture: all
-Maintainer: Paul Chote <sleipnir@sleipnirstuff.com>
+Maintainer: Chris Forbes <chrisf@ijw.co.nz>
 Installed-Size: {SIZE}	
 Depends: libopenal1, mono-runtime (>= 2.6.7), libmono-winforms2.0-cil, libfreetype6, libsdl1.2debian, libgl1-mesa-glx, libgl1-mesa-dri, libmono-i18n2.0-cil
 Section: games
diff --git a/packaging/package-all.sh b/packaging/package-all.sh
index 406af06711..b90b47e694 100755
--- a/packaging/package-all.sh
+++ b/packaging/package-all.sh
@@ -26,7 +26,7 @@ find . -path "*.mdb" -delete
 # they are now installed to the game directory instead of placed in the gac
 FILES="OpenRA.Game.exe OpenRA.Editor.exe OpenRA.Utility.exe OpenRA.Renderer.SdlCommon.dll OpenRA.Renderer.Cg.dll \
 OpenRA.Renderer.Gl.dll OpenRA.Renderer.Null.dll OpenRA.FileFormats.dll FreeSans.ttf FreeSansBold.ttf titles.ttf \
-cg glsl mods/ra mods/cnc COPYING HACKING INSTALL CHANGELOG"
+cg glsl mods/ra mods/cnc mods/d2k COPYING HACKING INSTALL CHANGELOG"
 
 echo "Copying files..."
 for i in $FILES; do
@@ -45,6 +45,7 @@ cp OpenRA.Game/OpenRA.ico packaging/built
 # Update mod versions
 sed "s/{DEV_VERSION}/$TAG/" ./mods/ra/mod.yaml > ./packaging/built/mods/ra/mod.yaml
 sed "s/{DEV_VERSION}/$TAG/" ./mods/cnc/mod.yaml > ./packaging/built/mods/cnc/mod.yaml
+sed "s/{DEV_VERSION}/$TAG/" ./mods/d2k/mod.yaml > ./packaging/built/mods/d2k/mod.yaml
 
 # Remove demo.mix from cnc
 rm ./packaging/built/mods/cnc/bits/demo.mix
@@ -82,5 +83,6 @@ echo "Creating packages..."
     fi
 ) &
 wait
+echo "Package build done."
 
 rm -rf $BUILTDIR
diff --git a/packaging/windows/OpenRA.nsi b/packaging/windows/OpenRA.nsi
index 06206892bc..0f271c6118 100644
--- a/packaging/windows/OpenRA.nsi
+++ b/packaging/windows/OpenRA.nsi
@@ -148,6 +148,22 @@ SectionGroup /e "Mods"
 		CopyFiles /SILENT "$TEMP\cnc-packages\*.mix" "$INSTDIR\mods\cnc\packages"
 		RMDir /r "$TEMP\cnc-packages"
 	SectionEnd
+	Section "Dune 2000" D2K
+		CreateDirectory "$TEMP\d2k-packages"
+		CopyFiles /SILENT "$INSTDIR\mods\d2k\packages\*.mix" "$TEMP\d2k-packages"
+		RMDir /r "$INSTDIR\mods\d2k"
+		SetOutPath "$INSTDIR\mods\d2k"
+		File "${SRCDIR}\mods\d2k\*.*"
+		File /r "${SRCDIR}\mods\d2k\maps"
+		File /r "${SRCDIR}\mods\d2k\chrome"
+		File /r "${SRCDIR}\mods\d2k\bits"
+		File /r "${SRCDIR}\mods\d2k\rules"
+		File /r "${SRCDIR}\mods\d2k\tilesets"
+		File /r "${SRCDIR}\mods\d2k\uibits"
+		CreateDirectory "$INSTDIR\mods\d2k\packages"
+		CopyFiles /SILENT "$TEMP\d2k-packages\*.mix" "$INSTDIR\mods\d2k\packages"
+		RMDir /r "$TEMP\d2k-packages"
+	SectionEnd
 SectionGroupEnd
 
 ;***************************
@@ -293,11 +309,13 @@ SectionEnd
 LangString DESC_Client ${LANG_ENGLISH} "OpenRA client and dependencies"
 LangString DESC_RA ${LANG_ENGLISH} "Base Red Alert mod"
 LangString DESC_CNC ${LANG_ENGLISH} "Base Command and Conquer mod"
+LangString DESC_D2K ${LANG_ENGLISH} "Base Dune 2000 mod"
 
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
 	!insertmacro MUI_DESCRIPTION_TEXT ${Client} $(DESC_Client)
 	!insertmacro MUI_DESCRIPTION_TEXT ${RA} $(DESC_RA)
 	!insertmacro MUI_DESCRIPTION_TEXT ${CNC} $(DESC_CNC)
+	!insertmacro MUI_DESCRIPTION_TEXT ${D2K} $(DESC_D2K)
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
 ;***************************