diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c9bd1d..cca328f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT ( Asteroids C CXX )
+PROJECT ( fysxasteroids C CXX )
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
@@ -97,3 +97,42 @@ INSTALL (FILES ${DATA_FILES}
 INSTALL (FILES fysxasteroids.desktop fysxasteroidseditor.desktop
 	DESTINATION /usr/share/applications
 	)
+
+# CPack specific stuff
+# INCLUDE(InstallRequiredSystemLibraries)
+
+SET(CPACK_PACKAGE_NAME "fysxasteroids")
+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A fun and good looking clone of the popular 80's game")
+SET(CPACK_PACKAGE_VENDOR "Martin Felis <martin@fysx.org>")
+SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
+SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING.txt")
+SET(CPACK_PACKAGE_VERSION_MAJOR "0")
+SET(CPACK_PACKAGE_VERSION_MINOR "9")
+SET(CPACK_PACKAGE_VERSION_PATCH "1")
+SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}")
+SET(CPACK_PACKAGE_CONTACT "Martin Felis <martin@fysx.org>")
+
+IF(WIN32 AND NOT UNIX)
+  # There is a bug in NSI that does not handle full unix paths properly. Make
+  # sure there is at least one set of four (4) backlasshes.
+  SET(CPACK_PACKAGE_ICON "${CMake_SOURCE_DIR}/Utilities/Release\\\\InstallIcon.bmp")
+  SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\fysxasteroids.exe")
+  SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} fysxdotorg")
+  SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\www.fysx.org")
+  SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\www.fysx.org")
+  SET(CPACK_NSIS_CONTACT "martin@fysx.org")
+  SET(CPACK_NSIS_MODIFY_PATH ON)
+ELSE(WIN32 AND NOT UNIX)
+	# Debian stuff
+	SET(CPACK_GENERATOR "DEB")
+	SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Martin Felis <martin@fysx.org>")
+  SET(CPACK_STRIP_FILES "bin/fysxasteroids" "bin/fysxasteroidseditor")
+  SET(CPACK_SOURCE_STRIP_FILES "TRUE")
+  SET(CPACK_DEBIAN_PACKAGE_SECTION "Games and Amusement")
+
+	SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-filesystem1.42.0 (>= 1.42.0-1), libboost-system1.42.0 (>= 1.42.0-1), libc6 (>= 2.4), libfreetype6 (>= 2.2.1), libgcc1 (>= 1:4.1.1), libglu1-mesa | libglu1, libice6 (>= 1:1.0.0), libpng12-0 (>= 1.2.13-4), libsdl-net1.2 (>= 1.2.7), libsdl-mixer1.2 (>= 1.2.6), libsdl1.2debian (>= 1.2.10-1), libsm6, libstdc++6 (>= 4.4.0), libx11-6, libxext6, zlib1g (>= 1:1.1.4)")
+
+ENDIF(WIN32 AND NOT UNIX)
+SET(CPACK_PACKAGE_EXECUTABLES "fysxasteroids" "fysxasteroidseditor")
+
+INCLUDE ( CPack )
diff --git a/engine/libraries/oglft/liboglft/CMakeLists.txt b/engine/libraries/oglft/liboglft/CMakeLists.txt
index 5db7064..34acf94 100644
--- a/engine/libraries/oglft/liboglft/CMakeLists.txt
+++ b/engine/libraries/oglft/liboglft/CMakeLists.txt
@@ -37,9 +37,9 @@ INSTALL(
   COMPONENT libraries
 )
 
-INSTALL(
-  FILES "${CMAKE_CURRENT_SOURCE_DIR}/OGLFT.h"
-  DESTINATION include/OGLFT
-    PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
-  COMPONENT headers
-)
+# INSTALL(
+#   FILES "${CMAKE_CURRENT_SOURCE_DIR}/OGLFT.h"
+#   DESTINATION include/OGLFT
+#     PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+#   COMPONENT headers
+# )