diff --git a/appveyor.yml b/appveyor.yml
index 19773d6d..19369b9b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,6 +2,14 @@ version: 1.2.{build}
 image:
   - Visual Studio 2013
   - Visual Studio 2015
+  
+environment:
+matrix:
+  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+    PAHO_WINDOWS_BUILD_BIT: x86
+  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    PAHO_WINDOWS_BUILD_BIT: x64
+    
 configuration: Debug
 install:
   - cmd: openssl version
@@ -23,9 +31,9 @@ build_script:
 
     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 2015" call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %PAHO_WINDOWS_BUILD_BIT%
 
-    if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2013" call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86
+    if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2013" call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" %PAHO_WINDOWS_BUILD_BIT%
 
     cmake -G "NMake Makefiles" -DPAHO_WITH_SSL=TRUE -DPAHO_BUILD_DOCUMENTATION=FALSE -DPAHO_BUILD_SAMPLES=TRUE -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=TRUE ..
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 11ae9343..9b293eff 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -113,15 +113,23 @@ IF (PAHO_WITH_SSL)
     ENDIF (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
 
     IF (WIN32)
-      SET(OPENSSL_SEARCH_PATH "C:/OpenSSL-Win64")
+      IF ($ENV{PAHO_WINDOWS_BUILD_BIT} STREQUAL "x86")
+        SET(OPENSSL_SEARCH_PATH "C:/OpenSSL-Win32")
+        SET(OPENSSL_SEARCH_LIB_PATH "${OPENSSL_SEARCH_PATH}/lib32")
+      ELSE ()
+        SET(OPENSSL_SEARCH_PATH "C:/OpenSSL-Win64")
+        SET(OPENSSL_SEARCH_LIB_PATH "${OPENSSL_SEARCH_PATH}/lib64")
+      ENDIF ()
+    ELSE()
+      SET(OPENSSL_SEARCH_LIB_PATH "${OPENSSL_SEARCH_PATH}/lib64")
     ENDIF ()
 
     FIND_PATH(OPENSSL_INCLUDE_DIR openssl/ssl.h
         HINTS ${OPENSSL_SEARCH_PATH}/include)
     FIND_LIBRARY(OPENSSL_LIB NAMES ssl libssl ssleay32
-        HINTS ${OPENSSL_SEARCH_PATH}/lib ${OPENSSL_SEARCH_PATH}/lib64)
+        HINTS ${OPENSSL_SEARCH_PATH}/lib ${OPENSSL_SEARCH_LIB_PATH})
     FIND_LIBRARY(OPENSSLCRYPTO_LIB NAMES crypto libcrypto libeay32
-      	HINTS ${OPENSSL_SEARCH_PATH}/lib ${OPENSSL_SEARCH_PATH}/lib64)
+      	HINTS ${OPENSSL_SEARCH_PATH}/lib ${OPENSSL_SEARCH_LIB_PATH})
 
     MESSAGE(STATUS "OpenSSL hints: ${OPENSSL_SEARCH_PATH}")
     MESSAGE(STATUS "OpenSSL headers found at ${OPENSSL_INCLUDE_DIR}")