--- a/CMakeLists.txt	Thu Aug 07 07:21:18 2008 +0000
+++ b/CMakeLists.txt	Thu Aug 07 12:01:58 2008 +0000
@@ -32,7 +32,8 @@
 set(CPACK_PACKAGE_VENDOR "Hedgewars")
 set(CPACK_PACKAGE_FILE_NAME "hedgewars-${HEDGEWARS_VERSION}")
 set(CPACK_SOURCE_PACKAGE_FILE_NAME "hedgewars-src-${HEDGEWARS_VERSION}")
-set(CPACK_PACKAGE_EXECUTABLES "hedgewars" "hedgewars")
+set(CPACK_SOURCE_GENERATOR "BZ2")
+set(CPACK_PACKAGE_EXECUTABLES "hedgewars")
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "Hedgewars ${HEDGEWARS_VERSION}")
 
@@ -41,7 +42,8 @@
 	set(CPACK_NSIS_HELP_LINK "http://www.hedgewars.org/")
 	set(CPACK_NSIS_URL_INFO_ABOUT "http://www.hedgewars.org/")
 	set(CPACK_NSIS_CONTACT "unC0Rr@gmail.com")
-	set(CPACK_NSIS_MODIFY_PATH ON)
+	set(CPACK_NSIS_MODIFY_PATH OFF)
+	set(CPACK_GENERATOR "ZIP;NSIS")
 else(WIN32 AND NOT UNIX)
 	set(CPACK_STRIP_FILES "bin/hedgewars;bin/hwengine")
 endif(WIN32 AND NOT UNIX)

--- a/QTfrontend/CMakeLists.txt	Thu Aug 07 07:21:18 2008 +0000
+++ b/QTfrontend/CMakeLists.txt	Thu Aug 07 12:01:58 2008 +0000
@@ -9,12 +9,15 @@
 set(QT_USE_QTMAIN TRUE)
 
 find_package(Qt4 REQUIRED)
-include(${QT_USE_FILE}) 
+include(${QT_USE_FILE})
 
 # Configure for SDL
 find_package(SDL REQUIRED)
 
 include_directories(${SDL_INCLUDE_DIR})
+if(UNIX)
+	include_directories("/usr/local/include") # HACK: in freebsd cannot find iconv.h included via SDL.h
+endif(UNIX)
 
 # Done
 include_directories(.)