diff --git a/Gui/DataExplorer.cmake b/Gui/DataExplorer.cmake
index d438736e55beab13b148fffc012bfb7a8d43928d..857edd5bf14cae839564d12bb928ffdef0e8781f 100644
--- a/Gui/DataExplorer.cmake
+++ b/Gui/DataExplorer.cmake
@@ -133,9 +133,7 @@ set_property(TARGET ogs-gui PROPERTY FOLDER "DataExplorer")
 ####################
 
 IF (OGS_PACKAGING)
-	IF(MSVC)
-
-	ELSEIF(APPLE)
+	IF(APPLE)
 		SET(MACOSX_BUNDLE_INFO_STRING "${PROJECT_NAME} ${OGS_VERSION}")
 		SET(MACOSX_BUNDLE_BUNDLE_VERSION "${PROJECT_NAME} ${OGS_VERSION}")
 		SET(MACOSX_BUNDLE_LONG_VERSION_STRING "${PROJECT_NAME} ${OGS_VERSION}")
@@ -151,18 +149,14 @@ IF (OGS_PACKAGING)
 		#EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${MACOSX_BUNDLE_ICON} ${MACOSX_BUNDLE_RESOURCES})
 
 		INSTALL (TARGETS ogs-gui DESTINATION .)
+		SET(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION .)
+		INCLUDE(InstallRequiredSystemLibraries)
+		INCLUDE(DeployQt4)
+		INSTALL_QT4_EXECUTABLE(ogs-gui.app)
 
-		set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION .)
-		include(InstallRequiredSystemLibraries)
-
-		include(DeployQt4)
-		install_qt4_executable(ogs-gui.app)
-	ELSE()
-
+		RETURN()
 	ENDIF()
 
-	return()
-
 	INSTALL (TARGETS ogs-gui RUNTIME DESTINATION bin COMPONENT ogs_gui)
 
 	IF(MSVC)
diff --git a/scripts/cmake/Pack.cmake b/scripts/cmake/Pack.cmake
index 95cf2b9de2fed6a0c264acc3e84b79908c17c19d..ce923501027ee33ff062940ee18fd54de4c71028 100644
--- a/scripts/cmake/Pack.cmake
+++ b/scripts/cmake/Pack.cmake
@@ -1,11 +1,6 @@
 #### Packaging setup for OGS-6 ####
-
-if(APPLE AND CMAKE_INSTALL_PREFIX MATCHES "/usr/local")
-	set(CMAKE_INSTALL_PREFIX "/Applications")
-endif()
-
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "OGS-6")
-SET(CPACK_PACKAGE_VENDOR "OpenGeoSys Community (http://www.opengeosys.com)")
+SET(CPACK_PACKAGE_VENDOR "OpenGeoSys Community (http://www.opengeosys.org)")
 SET(CPACK_PACKAGE_INSTALL_DIRECTORY "OGS-${OGS_VERSION_MAJOR}.${OGS_VERSION_MINOR}.${OGS_VERSION_PATCH}")
 SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md")
 SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE.txt")
@@ -14,21 +9,20 @@ SET(CPACK_PACKAGE_VERSION_MINOR "${OGS_VERSION_MINOR}")
 SET(CPACK_PACKAGE_VERSION_PATCH "${OGS_VERSION_PATCH}")
 SET(CPACK_PACKAGE_FILE_NAME "ogs-${OGS_VERSION}-${CMAKE_SYSTEM}-x${BITS}")
 
-IF(MSVC)
-
-ELSEIF(APPLE)
-	set(CPACK_GENERATOR "DragNDrop")
-	set(CPACK_DMG_FORMAT "UDBZ")
-	set(CPACK_DMG_VOLUME_NAME "${PROJECT_NAME}")
-	set(CPACK_SYSTEM_NAME "OSX")
-	set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${OGS_VERSION}")
-ELSE()
-
+IF(APPLE)
+	IF(CMAKE_INSTALL_PREFIX MATCHES "/usr/local")
+		SET(CMAKE_INSTALL_PREFIX "/Applications")
+	ENDIF()
+	SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.9")
+	SET(CMAKE_OSX_ARCHITECTURES "x86_64")
+	SET(CPACK_GENERATOR "DragNDrop")
+	SET(CPACK_DMG_FORMAT "UDBZ")
+	SET(CPACK_DMG_VOLUME_NAME "${PROJECT_NAME}")
+	SET(CPACK_SYSTEM_NAME "OSX")
+	INCLUDE(CPack)
+	RETURN()
 ENDIF()
 
-INCLUDE (CPack)
-return()
-
 IF (OGS_PACKAGING_ZIP)
 	SET (CPACK_GENERATOR ZIP)
 	SET(CPACK_PACKAGE_FILE_NAME "ogs-6")
@@ -53,9 +47,6 @@ ELSE (OGS_PACKAGING_ZIP)
 		IF(UNIX)
 			SET(CPACK_GENERATOR TGZ)
 		ELSE(UNIX)
-			IF(APPLE)
-		SET(CPACK_GENERATOR TGZ)
-			ENDIF(APPLE)
 		ENDIF(UNIX)
 		#SET(CPACK_STRIP_FILES "bin/ogs")
 		#SET(CPACK_SOURCE_STRIP_FILES "")