diff --git a/CMakeLists.txt b/CMakeLists.txt
index c5d2a31..96199c8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,8 +42,8 @@ install(
 if(WIN32)
   install(
     FILES
-    "${NDI_DIR}/Bin/x64/Processing.NDI.Lib.x64.dll"
-    "${NDI_DIR}/Bin/x64/Processing.NDI.Lib.Licenses.txt"
+    "${NDI_DIR}/Bin/${NDI_ARCH}/Processing.NDI.Lib.${NDI_ARCH}.dll"
+    "${NDI_LICENSE_DIR}/Processing.NDI.Lib.Licenses.txt"
     DESTINATION ${CMAKE_INSTALL_PREFIX}
   )
 elseif(APPLE)
diff --git a/cmake/Modules/FindNDI.cmake b/cmake/Modules/FindNDI.cmake
index e81950b..93f9996 100644
--- a/cmake/Modules/FindNDI.cmake
+++ b/cmake/Modules/FindNDI.cmake
@@ -3,10 +3,15 @@ if(WIN32)
     set(NDI_FOUND TRUE)
     set(NDI_DIR $ENV{NDI_SDK_DIR})
     string(REPLACE "\\" "/" NDI_DIR "${NDI_DIR}")
+    if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+      set(NDI_ARCH "x86")
+    else()
+      set(NDI_ARCH "x64")
+    endif()
     set(NDI_INCLUDE_DIR "${NDI_DIR}/Include")
-    set(NDI_LIBRARY_DIR "${NDI_DIR}/Lib/x64")
-    set(NDI_LICENSE_DIR "${NDI_DIR}/Lib/x64")
-    set(NDI_LIBS "Processing.NDI.Lib.x64")
+    set(NDI_LIBRARY_DIR "${NDI_DIR}/Lib/${NDI_ARCH}")
+    set(NDI_LICENSE_DIR "${NDI_DIR}/Bin/${NDI_ARCH}")
+    set(NDI_LIBS "Processing.NDI.Lib.${NDI_ARCH}")
   else()
     set(NDI_FOUND FALSE)
   endif()