diff --git a/.gitignore b/.gitignore
index 5e1b3a147..a6b7efe65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,8 @@ DartConfiguration.tcl
 _CPack_Packages
 
 # Packages
+*.zip
+*.exe
 *.sh
 *.tar.Z
 *.tar.gz
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2eed08453..b801c938f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -307,8 +307,12 @@ set(CPACK_PACKAGE_VERSION_MAJOR ${FREERDP_VERSION_MAJOR})
 set(CPACK_PACKAGE_VERSION_MINOR ${FREERDP_VERSION_MINOR})
 set(CPACK_PACKAGE_VERSION_PATCH ${FREERDP_VERSION_REVISION})
 
-set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
-set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
+set(CPACK_PACKAGE_INSTALL_DIRECTORY "FreeRDP")
+set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/LICENSE")
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
+
+set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/resources\\\\FreeRDP_Install.bmp")
+set(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/resources\\\\FreeRDP_Icon_96px.ico")
+set(CPACK_NSIS_MUI_UNICON "${CMAKE_SOURCE_DIR}/resource\\\\FreeRDP_Icon_96px.ico")
 
 include(CPack)
-
diff --git a/resources/FreeRDP_Icon_96px.ico b/resources/FreeRDP_Icon_96px.ico
new file mode 100644
index 000000000..21e095fe9
Binary files /dev/null and b/resources/FreeRDP_Icon_96px.ico differ
diff --git a/resources/FreeRDP_Install.bmp b/resources/FreeRDP_Install.bmp
new file mode 100644
index 000000000..8a42a1a8e
Binary files /dev/null and b/resources/FreeRDP_Install.bmp differ