diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt
index c8bf3b002f1..3ab1b4a3cdd 100644
--- a/source/blenderplayer/CMakeLists.txt
+++ b/source/blenderplayer/CMakeLists.txt
@@ -63,6 +63,8 @@ if(WIN32 AND NOT UNIX)
 	endif()
 
 	add_executable(blenderplayer ${EXETYPE} ${CMAKE_CURRENT_BINARY_DIR}/dna.c ../icons/winblender.rc)
+elseif(APPLE)
+	add_executable(blenderplayer MACOSX_BUNDLE ${CMAKE_CURRENT_BINARY_DIR}/dna.c)
 else()
 	add_executable(blenderplayer ${CMAKE_CURRENT_BINARY_DIR}/dna.c)
 endif()
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 87fd880ee72..0bd2763c7d2 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -711,6 +711,7 @@ elseif(APPLE)
 	endif()
 
 	# install blenderplayer bundle - copy of blender.app above. re-using macros et al
+	# note we are using OSX Bundle as base and copying Blender dummy bundle on top of it
 	if(WITH_GAMEENGINE AND WITH_PLAYER)
 		set(SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blenderplayer.app)
 		set(SOURCEINFO ${SOURCEDIR}/Contents/Info.plist)
@@ -719,6 +720,11 @@ elseif(APPLE)
 		# setup Info.plist
 		execute_process(COMMAND date "+%Y-%m-%d" OUTPUT_VARIABLE BLENDER_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
 
+		set_target_properties(blender PROPERTIES
+			MACOSX_BUNDLE_INFO_PLIST ${SOURCEINFO}
+			MACOSX_BUNDLE_SHORT_VERSION_STRING ${BLENDER_VERSION}
+			MACOSX_BUNDLE_LONG_VERSION_STRING "${BLENDER_VERSION} ${BLENDER_DATE}")
+
 		# important to make a clean install each time else old scripts get loaded.
 		install(
 			CODE
@@ -756,14 +762,6 @@ elseif(APPLE)
 				\${TARGETDIR_VER}
 			)
 		endif()
-
-		# This is a hack. Blender is linked to the right place (inside the .app)
-		# blenderplayer not ... that also means blenderplayer is in the right place
-		# only when we do make install. XXX to be fixed.
-		install(
-			CODE
-			"file(RENAME ${TARGETDIR}/blenderplayer ${TARGETDIR}/blenderplayer.app/Contents/MacOS/blenderplayer)"
-		)
 	
 	endif()
 endif()