diff --git a/scripts/cmake/CMakeSetup.cmake b/scripts/cmake/CMakeSetup.cmake
index 5768a4ee2baf407d5097460a62313d2d241ce716..7c6a8b3ee21396a63d6f0fb47d631387c47e5f8d 100644
--- a/scripts/cmake/CMakeSetup.cmake
+++ b/scripts/cmake/CMakeSetup.cmake
@@ -23,3 +23,20 @@ CMAKE_POLICY(SET CMP0011 OLD)
 
 # Get the hostname
 SITE_NAME(HOSTNAME)
+
+# Compute OS X version number
+IF(APPLE)
+	IF(CMAKE_SYSTEM_VERSION VERSION_EQUAL 12.0)
+		SET(OSX_VERSION 10.8 CACHE STRING "OS X version number")
+		SET(OSX_VERSION_NAME CACHE STRING "Mountain Lion")
+	ENDIF()
+	IF(CMAKE_SYSTEM_VERSION VERSION_EQUAL 13.0)
+		SET(OSX_VERSION 10.9 CACHE STRING "OS X version number")
+		SET(OSX_VERSION_NAME CACHE STRING "Mavericks")
+	ENDIF()
+	IF(CMAKE_SYSTEM_VERSION VERSION_EQUAL 14.0)
+		SET(OSX_VERSION 10.10 CACHE STRING "OS X version number")
+		SET(OSX_VERSION_NAME CACHE STRING "Yosemite")
+	ENDIF()
+ENDIF()
+MARK_AS_ADVANCED(OSX_VERSION OSX_VERSION_NAME)
diff --git a/scripts/cmake/packaging/Pack.cmake b/scripts/cmake/packaging/Pack.cmake
index c32d9503541bb8b186abfb6377eff4e439786445..96256c584a0dc72f68ef06d3f877fbd218a7da69 100644
--- a/scripts/cmake/packaging/Pack.cmake
+++ b/scripts/cmake/packaging/Pack.cmake
@@ -12,7 +12,7 @@ SET(CPACK_PACKAGE_VERSION_MAJOR "${OGS_VERSION_MAJOR}")
 SET(CPACK_PACKAGE_VERSION_MINOR "${OGS_VERSION_MINOR}")
 SET(CPACK_PACKAGE_VERSION_PATCH "${OGS_VERSION_PATCH}")
 IF(APPLE)
-	SET(CPACK_PACKAGE_FILE_NAME "ogs-${OGS_VERSION}-OSX-x${BITS}")
+	SET(CPACK_PACKAGE_FILE_NAME "ogs-${OGS_VERSION}-OSX-${OSX_VERSION}-x${BITS}")
 	SET(CPACK_SOURCE_PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME})
 ELSE()
 	SET(CPACK_PACKAGE_FILE_NAME "ogs-${OGS_VERSION}-${CMAKE_SYSTEM}-x${BITS}")
diff --git a/scripts/cmake/packaging/PackagingMac.cmake b/scripts/cmake/packaging/PackagingMac.cmake
index 2113566e7c666840f4e27743c4153d13ab0489ba..550da01b9e1e0f0834751de638e2b29ff9cc9f1e 100644
--- a/scripts/cmake/packaging/PackagingMac.cmake
+++ b/scripts/cmake/packaging/PackagingMac.cmake
@@ -1,4 +1,4 @@
-SET(CPACK_GENERATOR "DragNDrop")
+SET(CPACK_GENERATOR DragNDrop ZIP)
 SET(CPACK_DMG_FORMAT "UDBZ")
 
 # See http://stackoverflow.com/a/16662169/80480 how to create the DS_Store file.