diff --git a/Makefile b/Makefile
index b42f457b..7e0d2ec2 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,18 @@ ${SUSE}: ${WAR}  $(shell find suse/build -type f)
 suse.publish: ${SUSE} $(shell find suse/publish -type f)
 	./suse/publish/publish.sh
 
-
+msi: ${MSI}
+msi.publish: ${MSI}
+	mkdir -p "${MSIDIR}/${VERSION}/"
+	mkdir -p "${MSI_WEBDIR}"
+	sha256sum ${MSI} | sed 's, .*, ${ARTIFACTNAME}.msi,' > ${MSI_SHASUM}
+	cat ${MSI_SHASUM}
+	rsync -avz "${MSI}" "${MSIDIR}/${VERSION}/${ARTIFACTNAME}.msi"
+	rsync -avz "${MSI_SHASUM}" "${MSIDIR}/${VERSION}/"
+	./bin/indexGenerator.py \
+		--distribution windows \
+		--binaryDir "${MSIDIR}" \
+		--targetDir "${WAR_WEBDIR}"
 
 ${CLI}:
 	@mkdir ${TARGET} || true
diff --git a/env/release.mk b/env/release.mk
index 28c1c83d..cfb90491 100644
--- a/env/release.mk
+++ b/env/release.mk
@@ -22,6 +22,8 @@ export SUSEDIR=/srv/releases/jenkins/opensuse${RELEASELINE}
 export  RPM_WEBDIR=/var/www/pkg.jenkins.io.staging/redhat${RELEASELINE}
 export SUSE_WEBDIR=/var/www/pkg.jenkins.io.staging/opensuse${RELEASELINE}
 export  DEB_WEBDIR=/var/www/pkg.jenkins.io.staging/debian${RELEASELINE}
+export  WAR_WEBDIR=/var/www/pkg.jenkins.io.staging/war${RELEASELINE}
+export  MSI_WEBDIR=/var/www/pkg.jenkins.io.staging/windows${RELEASELINE}
 
 # URL to the aforementioned webdir
 export  RPM_URL=https://pkg.jenkins.io/redhat${RELEASELINE}
diff --git a/env/test.mk b/env/test.mk
index 35fcdc61..ce9f41e5 100644
--- a/env/test.mk
+++ b/env/test.mk
@@ -26,6 +26,8 @@ export SUSEDIR=${TESTDIR}/opensuse${RELEASELINE}
 export  RPM_WEBDIR=${TESTDIR}/redhat${RELEASELINE}
 export SUSE_WEBDIR=${TESTDIR}/opensuse${RELEASELINE}
 export  DEB_WEBDIR=${TESTDIR}/debian${RELEASELINE}
+export  WAR_WEBDIR=${TESTDIR}/war${RELEASELINE}
+export  MSI_WEBDIR=${TESTDIR}/windows${RELEASELINE}
 
 # URL to the aforementioned webdir.
 WEBSERVER=pkg.jenkins.io
diff --git a/setup.mk b/setup.mk
index 10fede8b..c3a9ba87 100644
--- a/setup.mk
+++ b/setup.mk
@@ -11,8 +11,8 @@ export TARGET:=target
 # jenkins-cli.jar
 export CLI:=${TARGET}/jenkins-cli.jar
 
-# where to generate MSI file?
-export MSI:=${TARGET}/msi/${ARTIFACTNAME}-${VERSION}.zip
+# MSI file to release
+export MSI?=$(error Required variable MSI must point to the jenkins.msi file you are packaging)
 export MSI_SHASUM:=${MSI}.sha256
 
 # where to generate OSX PKG file?