diff --git a/CMakeLists.txt b/CMakeLists.txt
index dd0564c..e3d3438 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,17 +7,16 @@ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${NV_CMAKE_DIR}")
 
 IF(WIN32)
 	# gnuwin32 paths:
-	SET(GNUWIN32_PATH "${NV_SOURCE_DIR}/extern/gnuwin")
-	SET(CMAKE_INCLUDE_PATH "${GNUWIN32_PATH}/include")
-	IF (NV_SYSTEM_PROCESSOR STREQUAL "AMD64")
-	  SET(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${GNUWIN32_PATH}/lib/win64")
-	ELSE(NV_SYSTEM_PROCESSOR STREQUAL "AMD64")
-	  SET(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${GNUWIN32_PATH}/lib/win32")
-	ENDIF(NV_SYSTEM_PROCESSOR STREQUAL "AMD64")
+	SET(GNUWIN32_PATH "${NV_SOURCE_DIR}/extern/gnuwin32")
+	SET(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} "${GNUWIN32_PATH}/include")
+	SET(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${GNUWIN32_PATH}/lib")
 	
 	# Set GLUT path:
-	SET(GLUT_ROOT_PATH "${NV_SOURCE_DIR}/extern/glut")
+	SET(GLUT_ROOT_DIR "${NV_SOURCE_DIR}/extern/glut")
 
+	# Set FreeImage path:
+	SET(FREEIMAGE_ROOT_DIR "${NV_SOURCE_DIR}/extern/FreeImage")
+	
 ENDIF(WIN32)
 
 INCLUDE(${NV_CMAKE_DIR}/OptimalOptions.cmake)
@@ -50,14 +49,22 @@ IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 
 SET(CPACK_PACKAGE_NAME "nvidia-texture-tools")
+SET(CPACK_PACKAGE_VERSION_MAJOR "2")
+SET(CPACK_PACKAGE_VERSION_MINOR "1")
+SET(CPACK_PACKAGE_VERSION_PATCH "0")
 SET(CPACK_PACKAGE_VERSION "2.1.0")
 SET(CPACK_PACKAGE_CONTACT "Ignacio Castaņo <icastano@nvidia.com>")
 SET(CPACK_PACKAGE_VENDOR "NVIDIA Corporation")
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "GPU-accelerated Texture Tools with support for DirectX 10 texture formats")
 
-SET(CPACK_PACKAGE_ICON "${NV_SOURCE_DIR}/project/vc8/nvcompress/nvidia.ico")
-
 SET(CPACK_PACKAGE_DESCRIPTION_FILE "${NV_SOURCE_DIR}/NVIDIA_Texture_Tools_README.txt")
 SET(CPACK_RESOURCE_FILE_LICENSE "${NV_SOURCE_DIR}/NVIDIA_Texture_Tools_LICENSE.txt")
 
+# NSIS options:
+IF(WIN32)
+	SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_VENDOR}\\\\NVIDIA Texture Tools 2.1")
+	SET(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_VENDOR}\\\\NVIDIA Texture Tools 2.1")
+	SET(CPACK_PACKAGE_ICON "${NV_SOURCE_DIR}\\\\project\\\\vc8\\\\nvcompress\\\\nvidia.ico")
+ENDIF(WIN32)
+
 INCLUDE(CPack)