diff --git a/CMakeLists.txt b/CMakeLists.txt
index 16380bc26..1a8c9864d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -105,7 +105,6 @@ endif (APPLE)
 
 # Main executable
 add_executable(openmw
-    MACOSX_BUNDLE
     ${BSA} ${BSA_HEADER}
     ${TOOLS} ${TOOLS_HEADER}
     ${OGRE} ${OGRE_HEADER}
@@ -132,15 +131,26 @@ endif (APPLE)
 
 # Apple bundling
 if (APPLE)
-  set_source_files_properties(
-    ${CMAKE_SOURCE_DIR}/files/openmw.cfg
-    ${CMAKE_SOURCE_DIR}/files/mac/plugins.cfg
-    PROPERTIES
-    MACOSX_PACKAGE_LOCATION MacOS
-  )
-  set_target_properties(
-    openmw
-    PROPERTIES
-    MACOSX_BUNDLE_BUNDLE_NAME "OpenMW"
-  )
+  set(MISC_FILES 
+		  ${CMAKE_SOURCE_DIR}/files/openmw.cfg
+		  ${CMAKE_SOURCE_DIR}/files/mac/plugins.cfg
+		  ${CMAKE_SOURCE_DIR}/files/mac/ogre.cfg)
+install(TARGETS openmw 
+		BUNDLE DESTINATION .
+		RUNTIME DESTINATION ../MacOS 
+		COMPONENT Runtime)
+install(FILES ${MISC_FILES} DESTINATION ../MacOS)
+set(CPACK_GENERATOR "Bundle")
+set(CPACK_BUNDLE_PLIST "${CMAKE_SOURCE_DIR}/files/mac/Info.plist")
+set(CPACK_BUNDLE_ICON  "${CMAKE_SOURCE_DIR}/files/mac/openmw.icns")
+set(CPACK_BUNDLE_NAME "OpenMW")
+set(CPACK_PACKAGE_VERSION "0.07")
+set(CPACK_PACKAGE_VERSION_MAJOR "0")
+set(CPACK_PACKAGE_VERSION_MINOR "07")
+set(CPACK_PACKAGE_VERSION_PATCH "")
+
+include(CPack)
+
 endif (APPLE)
+
+
diff --git a/files/mac/Info.plist b/files/mac/Info.plist
new file mode 100644
index 000000000..77ec89618
--- /dev/null
+++ b/files/mac/Info.plist
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleIconFile</key>
+	<string>OpenMW.icns</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>openmw</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleLongVersionString</key>
+	<string></string>
+	<key>CFBundleName</key>
+	<string>OpenMW</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>0.07</string>
+	<key>CSResourcesFileMapped</key>
+	<true/>
+	<key>LSRequiresCarbon</key>
+	<true/>
+	<key>NSHumanReadableCopyright</key>
+	<string></string>
+</dict>
+</plist>
diff --git a/files/mac/openmw.icns b/files/mac/openmw.icns
new file mode 100644
index 000000000..dfea24660
Binary files /dev/null and b/files/mac/openmw.icns differ