diff --git a/.travis.yml b/.travis.yml
index 64f9a2a7fb..b957b1bffc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,8 +38,7 @@ notifications:
     skip_join: true
 
 before_deploy:
- - apt-get download nsis nsis-common markdown
- - dpkg -x nsis*deb $HOME
+ - apt-get download markdown
  - dpkg -x markdown*deb $HOME
  - export PATH=$PATH:$HOME/usr/bin
  - DOTVERSION=`echo ${TRAVIS_TAG} | sed "s/-/\\./g"`
@@ -51,7 +50,6 @@ deploy:
   api_key:
     secure: "g/LU11f+mjqv+lj0sR1UliHwogXL4ofJUwoG5Dbqlvdf5UTLWytw/OWSCv8RGyuh10miyWeaoqHh1cn2C1IFhUEqN1sSeKKKOWOTvJ2FR5mzi9uH3d/MOBzG5icQ7Qh0fZ1YPz5RaJJhYu6bmfvA/1gD49GoaX2kxQL4J5cEBgg="
   file:
-    - build/OpenRA-${TRAVIS_TAG}.exe
     - build/OpenRA-${TRAVIS_TAG}.zip
     - build/openra_${DOTVERSION}_all.deb
   skip_cleanup: true
diff --git a/appveyor.yml b/appveyor.yml
index fdba194ad6..cec0d00b8f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,9 +1,32 @@
 version: 1.0.{build}
+
+environment:
+  NSIS_ROOT: C:\nsis
+
+install:
+  - appveyor DownloadFile "http://downloads.sourceforge.net/project/nsis/NSIS 2/2.46/nsis-2.46-setup.exe" -FileName nsissetup.exe
+  - nsissetup /S /D=%NSIS_ROOT%
+
 before_build:
 - make dependencies
+
 build:
   project: OpenRA.sln
   verbosity: minimal
+
 test_script:
-- nunit-console-x86.exe OpenRA.Test.dll
-deploy: off
\ No newline at end of file
+  - nunit-console-x86.exe OpenRA.Test.dll
+
+before_deploy:
+  - make docs
+  - cp OpenRA.Game/OpenRA.ico .
+  - appveyor DownloadFile "https://raw.githubusercontent.com/wiki/OpenRA/OpenRA/Changelog.md" -FileName Changelog.md
+  - '%NSIS_ROOT%\makensis /DSRCDIR="%APPVEYOR_BUILD_FOLDER%" /DDEPSDIR="%APPVEYOR_BUILD_FOLDER%\thirdparty\windows" /V3 packaging/windows/OpenRA.nsi'
+
+deploy:
+  - provider: GitHub
+    auth_token:
+      secure: Z7RC+ckfvf7Kxf2EdWZCP7bgGjRnhgbMeieQP6VVhiZprwvbEzGXI2Wma+FGAq65
+    artifact: packaging\windows\OpenRA.Setup.exe
+    on:
+        appveyor_repo_tag: true
\ No newline at end of file
diff --git a/make.ps1 b/make.ps1
index 8f5269e1c8..0c03fdd1be 100644
--- a/make.ps1
+++ b/make.ps1
@@ -30,6 +30,7 @@ if ($args.Length -eq 0)
 	echo "                  'dependencies' commands to restore removed files."
 	echo "  test            Tests the default mods for errors."
 	echo "  check           Checks .cs files for StyleCop violations."
+	echo "  docs            Generates the trait and Lua API documentation."
 	echo ""
 	$command = (Read-Host "Enter command").Split(' ', 2)
 }
@@ -156,6 +157,11 @@ elseif ($command -eq "check")
 	echo "Checking for code style violations in OpenRA.TilesetBuilder..."
 	./OpenRA.Utility.exe cnc --check-code-style OpenRA.TilesetBuilder
 }
+elseif ($command -eq "docs")
+{
+	./OpenRA.Utility.exe d2k --docs | Out-File DOCUMENTATION.md
+	./OpenRA.Utility.exe ra --lua-docs | Out-File Lua-API.md
+}
 else
 {
 	echo ("Invalid command '{0}'" -f $command)
diff --git a/packaging/package-all.sh b/packaging/package-all.sh
index ba5833bd5f..f3a77a0749 100755
--- a/packaging/package-all.sh
+++ b/packaging/package-all.sh
@@ -2,7 +2,7 @@
 # OpenRA master packaging script
 
 if [ $# -ne "2" ]; then
-	echo "Usage: `basename $0` version outputdir"
+    echo "Usage: `basename $0` version outputdir"
     exit 1
 fi
 
@@ -38,7 +38,7 @@ FILES=('OpenRA.Game.exe' 'OpenRA.Editor.exe' 'OpenRA.Utility.exe' \
 
 echo "Copying files..."
 for i in "${FILES[@]}"; do
-	cp -R "${i}" "packaging/built/${i}" || exit 3
+    cp -R "${i}" "packaging/built/${i}" || exit 3
 done
 
 # SharpZipLib for zip file support
@@ -74,15 +74,19 @@ cp OpenRA.exe packaging/built
 cd packaging
 echo "Creating packages..."
 
-pushd windows
-echo "Building Windows setup.exe"
-makensis -V2 -DSRCDIR="$BUILTDIR" -DDEPSDIR="${SRCDIR}/thirdparty/windows" OpenRA.nsi
-if [ $? -eq 0 ]; then
-    mv OpenRA.exe "$OUTPUTDIR"/OpenRA-$TAG.exe
+if [ -x /usr/bin/makensis ]; then
+    pushd windows
+    echo "Building Windows setup.exe"
+    makensis -V2 -DSRCDIR="$BUILTDIR" -DDEPSDIR="${SRCDIR}/thirdparty/windows" OpenRA.nsi
+    if [ $? -eq 0 ]; then
+        mv OpenRA.Setup.exe "$OUTPUTDIR"/OpenRA-$TAG.exe
+    else
+        echo "Windows package build failed."
+    fi
+    popd
 else
-    echo "Windows package build failed."
+    echo "Skipping Windows setup.exe build due to missing NSIS"
 fi
-popd
 
 pushd osx
 echo "Zipping OS X package"
diff --git a/packaging/windows/OpenRA.nsi b/packaging/windows/OpenRA.nsi
index db8fd6f95b..e8ff8ff052 100644
--- a/packaging/windows/OpenRA.nsi
+++ b/packaging/windows/OpenRA.nsi
@@ -1,4 +1,4 @@
-; Copyright 2007-2014 OpenRA developers (see AUTHORS)
+; Copyright 2007-2015 OpenRA developers (see AUTHORS)
 ; This file is part of OpenRA.
 ;
 ;  OpenRA is free software: you can redistribute it and/or modify
@@ -20,7 +20,7 @@
 !include "WordFunc.nsh"
 
 Name "OpenRA"
-OutFile "OpenRA.exe"
+OutFile "OpenRA.Setup.exe"
 
 InstallDir $PROGRAMFILES\OpenRA
 InstallDirRegKey HKLM "Software\OpenRA" "InstallDir"
@@ -75,10 +75,10 @@ Section "Game" GAME
 	File "${SRCDIR}\Mono.Nat.dll"
 	File "${SRCDIR}\AUTHORS"
 	File "${SRCDIR}\COPYING"
-	File "${SRCDIR}\README.html"
-	File "${SRCDIR}\CHANGELOG.html"
-	File "${SRCDIR}\CONTRIBUTING.html"
-	File "${SRCDIR}\DOCUMENTATION.html"
+	File "${SRCDIR}\README.md"
+	File "${SRCDIR}\CHANGELOG.md"
+	File "${SRCDIR}\CONTRIBUTING.md"
+	File "${SRCDIR}\DOCUMENTATION.md"
 	File "${SRCDIR}\OpenRA.ico"
 	File "${SRCDIR}\SharpFont.dll"
 	File "${SRCDIR}\SDL2-CS.dll"
@@ -99,8 +99,8 @@ Section "Game" GAME
 		CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
 		CreateShortCut "$SMPROGRAMS\$StartMenuFolder\OpenRA.lnk" $OUTDIR\OpenRA.exe "" \
 			"$OUTDIR\OpenRA.exe" "" "" "" ""
-		CreateShortCut "$SMPROGRAMS\$StartMenuFolder\README.lnk" $OUTDIR\README.html "" \
-			"$OUTDIR\README.html" "" "" "" ""
+		CreateShortCut "$SMPROGRAMS\$StartMenuFolder\README.lnk" $OUTDIR\README.md "" \
+			"$OUTDIR\README.md" "" "" "" ""
 	!insertmacro MUI_STARTMENU_WRITE_END
 
 	SetOutPath "$INSTDIR\lua"
@@ -193,10 +193,10 @@ Function ${UN}Clean
 	Delete $INSTDIR\SharpFont.dll
 	Delete $INSTDIR\AUTHORS
 	Delete $INSTDIR\COPYING
-	Delete $INSTDIR\README.html
-	Delete $INSTDIR\CHANGELOG.html
-	Delete $INSTDIR\CONTRIBUTING.html
-	Delete $INSTDIR\DOCUMENTATION.html
+	Delete $INSTDIR\README.md
+	Delete $INSTDIR\CHANGELOG.md
+	Delete $INSTDIR\CONTRIBUTING.md
+	Delete $INSTDIR\DOCUMENTATION.md
 	Delete $INSTDIR\OpenRA.ico
 	Delete "$INSTDIR\global mix database.dat"
 	Delete $INSTDIR\MaxMind.Db.dll