diff --git a/appveyor.yml b/appveyor.yml
index 0498545c..40df1715 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,49 +2,43 @@ version: 1.2.{build}
 image:
   - Visual Studio 2013
   - Visual Studio 2015
-configuration: Debug
-install:
-  - cmd: openssl version
-
-  - cmd: python --version
-
+configuration: Debug
+install:
+  - cmd: openssl version
+  - cmd: python --version
   - cmd: netsh advfirewall firewall add rule name="Python 2.7" dir=in action=allow program="C:\Python27\python.exe" enable=yes
-
   - cmd: netsh advfirewall firewall add rule name="Open Port 1883" dir=in action=allow protocol=TCP localport=1883
-
-  - cmd: netsh advfirewall set allprofiles state off
-
-  - ps: Start-Process python -ArgumentList 'test\mqttsas2.py'
-
-  - cmd: C:\Python36\python --version
-
-  - cmd: git clone https://github.com/eclipse/paho.mqtt.testing.git
-
-  - cmd: cd paho.mqtt.testing\interoperability
-
-  - ps: Start-Process C:\Python36\python -ArgumentList 'startbroker.py -c client_testing.conf'
-
-  - cmd: cd ..\..
+  - cmd: netsh advfirewall set allprofiles state off
+  - ps: Start-Process python -ArgumentList 'test\mqttsas2.py'
+  - cmd: C:\Python36\python --version
+  - cmd: git clone https://github.com/eclipse/paho.mqtt.testing.git
+  - cmd: cd paho.mqtt.testing\interoperability
+  - ps: Start-Process C:\Python36\python -ArgumentList 'startbroker.py -c client_testing.conf'
+  - cmd: cd ..\..
 
 build_script:
 - cmd: >-
     mkdir build.paho
-
     cd build.paho
-
     echo %APPVEYOR_BUILD_WORKER_IMAGE%
-
     if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2015" call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64
-
     if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2013" call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x64
-
     cmake -G "NMake Makefiles" -DPAHO_WITH_SSL=TRUE -DPAHO_BUILD_DOCUMENTATION=FALSE -DPAHO_BUILD_SAMPLES=TRUE -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=TRUE ..
-
-    nmake
-
+    nmake
     ctest -T test -VV
-
     cd ..
 
+after_build:
+- cmd: >-
+    set ZIPNAME=eclipse-paho-mqtt-c-windows.zip 
+    7z a %ZIPNAME% %APPVEYOR_BUILD_FOLDER%\build.paho\src\*.dll
+    7z a %ZIPNAME% %APPVEYOR_BUILD_FOLDER%\build.paho\src\*.lib
+    7z a %ZIPNAME% %APPVEYOR_BUILD_FOLDER%\build.paho\src\*.exe -r
+    7z a %ZIPNAME% %APPVEYOR_BUILD_FOLDER%\src\MQTTClient.h %APPVEYOR_BUILD_FOLDER%\src\MQTTAsync.h
+
+artifacts:
+- path: eclipse-paho-mqtt-c-windows.zip
+  name: paho-mqtt-c
+
 test:
   assemblies: build/Testing/*/Test.xml