diff --git a/CMakeLists.txt b/CMakeLists.txt
index daacc1ef187529c07de2b9928f3d86e92dba2606..abc1becee05a8ed4dfbcc1609c627ddfa28ecb9f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,11 +60,18 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 # For Apple set the icns file containing icons
 IF(APPLE)
   # set how it shows up in the Info.plist file
-  SET(MACOSX_BUNDLE_ICON_FILE JPSvis.icns) 
+  SET(MACOSX_BUNDLE_ICON_FILE ${CMAKE_CURRENT_SOURCE_DIR}/forms/icons/JPSvis.png) 
   # set where in the bundle to put the icns file
-  SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/forms/icons/JPSvis.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+  SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/forms/icons/JPSvis.png PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+  set(MACOSX_BUNDLE_BUNDLE_NAME "JPSvis")
+  set(MACOSX_BUNDLE_BUNDLE_VERSION "${JPSVIS_VERSION}")
+  set(MACOSX_BUNDLE_LONG_VERSION_STRING "${JPSVIS_VERSION}")
+  set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${JPSVIS_VERSION}")
+  set(MACOSX_BUNDLE_COPYRIGHT "Copyright (c) 2015 Forschungszentrum Juelich. All rights reserved.")
+  set(MACOSX_BUNDLE_GUI_IDENTIFIER "www.jupedsim.org")
+
   # include the icns file in the target
-  SET(SAMPLE_SRCS ${SAMPLE_SRCS} ${CMAKE_CURRENT_SOURCE_DIR}/forms/icons/JPSvis.icns)
+  SET(SAMPLE_SRCS ${SAMPLE_SRCS} ${CMAKE_CURRENT_SOURCE_DIR}/forms/icons/JPSvis.png)
 ENDIF(APPLE)
 
 
@@ -249,8 +256,11 @@ ADD_EXECUTABLE( JPSvis  MACOSX_BUNDLE WIN32
   ${SAMPLE_MOC_HDRS}
   ${SAMPLE_UI_HDRS} 
   ${SAMPLE_RESOURCES_RCS}
+  ${CMAKE_CURRENT_SOURCE_DIR}/forms/icons/JPSvis.png
   )
 
+
+
 # last thing we have to do is to tell CMake what libraries our executable needs,
 # luckily FIND_PACKAGE prepared QT_LIBRARIES variable for us:
 set(VTK_USE_GUISUPPORT  ON) 
@@ -330,17 +340,25 @@ IF(APPLE)
   SET(plugin_dest_dir JPSvis.app/Contents/MacOS)
   SET(qtconf_dest_dir JPSvis.app/Contents/Resources)
   SET(APPS "\${CMAKE_INSTALL_PREFIX}/JPSvis.app")
+  
 ENDIF(APPLE)
 IF(WIN32)
   SET(APPS "\${CMAKE_INSTALL_PREFIX}/bin/JPSvis.exe")
 ENDIF(WIN32)
 
+
+if (APPLE)
+  set_target_properties(JPSvis PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
+endif ()
+
+
 #--------------------------------------------------------------------------------
 # Install the QtTest application, on Apple, the bundle is at the root of the
 # install tree, and on other platforms it'll go into the bin directory.
 INSTALL(TARGETS JPSvis
   BUNDLE DESTINATION . COMPONENT Runtime
   RUNTIME DESTINATION bin COMPONENT Runtime
+  
   )
 
 #--------------------------------------------------------------------------------
diff --git a/Info.plist b/Info.plist
new file mode 100644
index 0000000000000000000000000000000000000000..547b046476903d12f299258fb210a594c378a84f
--- /dev/null
+++ b/Info.plist
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>JPSvis</string>
+	<key>CFBundleGetInfoString</key>
+	<string></string>
+	<key>CFBundleIconFile</key>
+	<string>/Users/chraibi/Workspace/jpsvis/forms/icons/JPSvis.png</string>
+	<key>CFBundleIdentifier</key>
+	<string>www.jupedsim.org</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleLongVersionString</key>
+	<string>0.5.0</string>
+	<key>CFBundleName</key>
+	<string>JPSvis</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>0.5.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>0.5.0</string>
+	<key>CSResourcesFileMapped</key>
+	<true/>
+	<key>LSRequiresCarbon</key>
+	<true/>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright (c) 2015 Forschungszentrum Juelich. All rights reserved.</string>
+        <key>NSHighResolutionCapable</key>
+        <true/>
+</dict>
+</plist>