diff --git a/CMakeLists.txt b/CMakeLists.txt
index d8e4da66dc..2e699c31ca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -139,7 +139,7 @@ check_find_package_result(OPENGL_FOUND "OpenGL")
 # http://www.wxwidgets.org/manuals/2.8/wx_librarieslist.html
 
 if( KICAD_AUIMANAGER OR KICAD_AUITOOLBAR )
-    find_package(wxWidgets COMPONENTS gl aui adv html core net base QUIET)
+    find_package(wxWidgets COMPONENTS gl adv html core net base QUIET)
 #    find_package(wxWidgets COMPONENTS gl adv html core net base QUIET)
 else( KICAD_AUIMANAGER OR KICAD_AUITOOLBAR )
     find_package(wxWidgets COMPONENTS gl adv html core net base QUIET)
diff --git a/cvpcb/CMakeLists.txt b/cvpcb/CMakeLists.txt
index 31eff70fda..b3d274a12e 100644
--- a/cvpcb/CMakeLists.txt
+++ b/cvpcb/CMakeLists.txt
@@ -6,6 +6,15 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
                     ../pcbnew
                     ../polygon
                     ${CMAKE_SOURCE_DIR}/common)
+##
+# Name of target on OSX is also the title of the application
+# on other targets this should be as normal
+##
+if(APPLE)
+	set(CVPCB_NAME CvPCB)
+else(APPLE)
+	set(CVPCB_NAME cvpcb)
+endif(APPLE)
 
 set(CVPCB_SRCS
     autosel.cpp
@@ -41,6 +50,9 @@ if(WIN32)
     endif(MINGW)
 endif(WIN32)
 
+###
+# CvPCB.app resources
+###
 if(APPLE)
     set(CVPCB_RESOURCES cvpcb.icns cvpcb_doc.icns)
     set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/cvpcb.icns"
@@ -49,17 +61,19 @@ if(APPLE)
                                 PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
     set(MACOSX_BUNDLE_ICON_FILE cvpcb.icns)
     set(MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.cvpcb)
-    set(MACOSX_BUNDLE_NAME cvpcb)
 endif(APPLE)
 
-add_executable(cvpcb WIN32 MACOSX_BUNDLE ${CVPCB_SRCS} ${CVPCB_RESOURCES})
+add_executable(${CVPCB_NAME} WIN32 MACOSX_BUNDLE ${CVPCB_SRCS} ${CVPCB_RESOURCES})
 
+###
+# CvPCB.app creation
+###
 if(APPLE)
-    set_target_properties(cvpcb PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
+    set_target_properties(${CVPCB_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
 endif(APPLE)
 
-target_link_libraries(cvpcb 3d-viewer common pcbcommon polygon bitmaps kbool ${OPENGL_LIBRARIES} ${wxWidgets_LIBRARIES})
+target_link_libraries(${CVPCB_NAME} 3d-viewer common pcbcommon polygon bitmaps kbool ${OPENGL_LIBRARIES} ${wxWidgets_LIBRARIES})
 
-install(TARGETS cvpcb
+install(TARGETS ${CVPCB_NAME}
         DESTINATION ${KICAD_BIN}
         COMPONENT binary)
diff --git a/cvpcb/Info.plist b/cvpcb/Info.plist
index fcb8220794..ac97768ccf 100644
--- a/cvpcb/Info.plist
+++ b/cvpcb/Info.plist
@@ -20,7 +20,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>cvpcb</string>
+	<string>CvPCB</string>
 	<key>CFBundleGetInfoString</key>
 	<string></string>
 	<key>CFBundleIconFile</key>
@@ -32,7 +32,7 @@
 	<key>CFBundleLongVersionString</key>
 	<string></string>
 	<key>CFBundleName</key>
-	<string></string>
+	<string>CvPCB</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
diff --git a/cvpcb/cvpcb.cpp b/cvpcb/cvpcb.cpp
index f06dc2b931..ded99857b2 100644
--- a/cvpcb/cvpcb.cpp
+++ b/cvpcb/cvpcb.cpp
@@ -79,7 +79,7 @@ bool WinEDA_App::OnInit()
     wxString           msg;
     WinEDA_CvpcbFrame* frame   = NULL;
 
-    InitEDA_Appl( wxT( "Cvpcb" ), APP_TYPE_CVPCB );
+    InitEDA_Appl( wxT( "CvPCB" ), APP_TYPE_CVPCB );
 
     if( m_Checker && m_Checker->IsAnotherRunning() )
     {
diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index c57ea55aed..d36ffc4995 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -4,6 +4,15 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
                     ${CMAKE_SOURCE_DIR}/common
                     ${Boost_INCLUDE_DIR}
                    )
+##
+# Name of target on OSX is also the title of the application
+# on other targets this should be as normal
+##
+if(APPLE)
+	set(EESCHEMA_NAME EESchema)
+else(APPLE)
+	set(EESCHEMA_NAME eeschema)
+endif(APPLE)
 
 set(EESCHEMA_SRCS
     annotate.cpp
@@ -146,18 +155,17 @@ if(APPLE)
                                 PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
     set(MACOSX_BUNDLE_ICON_FILE eeschema.icns)
     set(MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.eeschema)
-    set(MACOSX_BUNDLE_NAME eeschema)
 endif(APPLE)
 
-add_executable(eeschema WIN32 MACOSX_BUNDLE ${EESCHEMA_SRCS} ${EESCHEMA_EXTRA_SRCS} ${EESCHEMA_RESOURCES})
+add_executable(${EESCHEMA_NAME} WIN32 MACOSX_BUNDLE ${EESCHEMA_SRCS} ${EESCHEMA_EXTRA_SRCS} ${EESCHEMA_RESOURCES})
 
 if(APPLE)
-    set_target_properties(eeschema PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
+    set_target_properties(${EESCHEMA_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
 endif(APPLE)
 
-target_link_libraries(eeschema common bitmaps ${wxWidgets_LIBRARIES})
+target_link_libraries(${EESCHEMA_NAME} common bitmaps ${wxWidgets_LIBRARIES})
 
-install(TARGETS eeschema
+install(TARGETS ${EESCHEMA_NAME}
         DESTINATION ${KICAD_BIN}
         COMPONENT binary)
 
diff --git a/eeschema/Info.plist b/eeschema/Info.plist
index bf628aa1cd..69f9dce884 100644
--- a/eeschema/Info.plist
+++ b/eeschema/Info.plist
@@ -20,7 +20,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>eeschema</string>
+	<string>EESchema</string>
 	<key>CFBundleGetInfoString</key>
 	<string></string>
 	<key>CFBundleIconFile</key>
@@ -32,7 +32,7 @@
 	<key>CFBundleLongVersionString</key>
 	<string></string>
 	<key>CFBundleName</key>
-	<string></string>
+	<string>EESchema</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
diff --git a/eeschema/eeschema.cpp b/eeschema/eeschema.cpp
index 3be4968886..a6be246edc 100644
--- a/eeschema/eeschema.cpp
+++ b/eeschema/eeschema.cpp
@@ -10,6 +10,7 @@
 #include "gestfich.h"
 #include "bitmaps.h"
 #include "eda_dde.h"
+#include "id.h"
 
 #include "program.h"
 #include "general.h"
@@ -110,6 +111,14 @@ void WinEDA_App::MacOpenFile(const wxString &fileName) {
 
 bool WinEDA_App::OnInit()
 {
+#ifdef __WXMAC__
+	wxApp::SetExitOnFrameDelete(false);
+	wxApp::s_macAboutMenuItemId = ID_KICAD_ABOUT;
+	wxApp::s_macPreferencesMenuItemId = ID_CONFIG_REQ;
+#endif /* __WXMAC__ */
+
+
+
     wxFileName             fn;
     WinEDA_SchematicFrame* frame = NULL;
 
diff --git a/gerbview/CMakeLists.txt b/gerbview/CMakeLists.txt
index 9d8e526548..0dac90ea10 100644
--- a/gerbview/CMakeLists.txt
+++ b/gerbview/CMakeLists.txt
@@ -6,6 +6,15 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
                     ../cvpcb
                     ../pcbnew
                     ../polygon)
+##
+# Name of target on OSX is also the title of the application
+# on other targets this should be as normal
+##
+if(APPLE)
+	set(GERBVIEW_NAME GerbView)
+else(APPLE)
+	set(GERBVIEW_NAME gerbview)
+endif(APPLE)
 
 set(GERBVIEW_SRCS
     block.cpp
@@ -61,17 +70,16 @@ if(APPLE)
                                 PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
     set(MACOSX_BUNDLE_ICON_FILE gerbview.icns)
     set(MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.gerbview)
-    set(MACOSX_BUNDLE_NAME gerbview)
 endif(APPLE)
 
-add_executable(gerbview WIN32 MACOSX_BUNDLE ${GERBVIEW_SRCS} ${GERBVIEW_EXTRA_SRCS} ${GERBVIEW_RESOURCES})
+add_executable(${GERBVIEW_NAME} WIN32 MACOSX_BUNDLE ${GERBVIEW_SRCS} ${GERBVIEW_EXTRA_SRCS} ${GERBVIEW_RESOURCES})
 
 if(APPLE)
-    set_target_properties(gerbview PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
+    set_target_properties(${GERBVIEW_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
 endif(APPLE)
 
-target_link_libraries(gerbview common pcbcommon 3d-viewer polygon bitmaps kbool ${OPENGL_LIBRARIES} ${wxWidgets_LIBRARIES})
+target_link_libraries(${GERBVIEW_NAME} common pcbcommon 3d-viewer polygon bitmaps kbool ${OPENGL_LIBRARIES} ${wxWidgets_LIBRARIES})
 
-install(TARGETS gerbview
+install(TARGETS ${GERBVIEW_NAME}
         DESTINATION ${KICAD_BIN}
         COMPONENT binary)
diff --git a/gerbview/Info.plist b/gerbview/Info.plist
index 7ab0359b43..04c4833aec 100644
--- a/gerbview/Info.plist
+++ b/gerbview/Info.plist
@@ -25,7 +25,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>gerbview</string>
+	<string>GerbView</string>
 	<key>CFBundleGetInfoString</key>
 	<string></string>
 	<key>CFBundleIconFile</key>
@@ -37,7 +37,7 @@
 	<key>CFBundleLongVersionString</key>
 	<string></string>
 	<key>CFBundleName</key>
-	<string></string>
+	<string>GerbView</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
diff --git a/kicad/CMakeLists.txt b/kicad/CMakeLists.txt
index 65238d00af..28604c471e 100644
--- a/kicad/CMakeLists.txt
+++ b/kicad/CMakeLists.txt
@@ -36,17 +36,24 @@ if(APPLE)
     set(MACOSX_BUNDLE_NAME kicad)
 endif(APPLE)
 
-add_executable(kicad WIN32 MACOSX_BUNDLE ${KICAD_SRCS} ${KICAD_EXTRA_SRCS} ${KICAD_RESOURCES})
-
 if(APPLE)
-    set_target_properties(kicad PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
+	add_executable(KiCad MACOSX_BUNDLE ${KICAD_SRCS} ${KICAD_EXTRA_SRCS} ${KICAD_RESOURCES})
+else(APPLE)
+	add_executable(kicad WIN32 ${KICAD_SRCS} ${KICAD_EXTRA_SRCS} ${KICAD_RESOURCES})
 endif(APPLE)
 
-target_link_libraries(kicad common bitmaps ${wxWidgets_LIBRARIES})
-
-install(TARGETS kicad
+if(APPLE)
+    set_target_properties(KiCad PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
+	target_link_libraries(KiCad common bitmaps ${wxWidgets_LIBRARIES})
+install(TARGETS KiCad
         DESTINATION ${KICAD_BIN}
         COMPONENT binary)
+else(APPLE)
+	target_link_libraries(kicad common bitmaps ${wxWidgets_LIBRARIES})
+	install(TARGETS kicad
+        DESTINATION ${KICAD_BIN}
+        COMPONENT binary)
+endif(APPLE)
 
 if(KICAD_MINIZIP)
     add_subdirectory(minizip)
diff --git a/kicad/Info.plist b/kicad/Info.plist
index a5eab25f49..b33a80d824 100644
--- a/kicad/Info.plist
+++ b/kicad/Info.plist
@@ -16,7 +16,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>kicad</string>
+	<string>KiCad</string>
 	<key>CFBundleGetInfoString</key>
 	<string></string>
 	<key>CFBundleIconFile</key>
@@ -28,7 +28,7 @@
 	<key>CFBundleLongVersionString</key>
 	<string></string>
 	<key>CFBundleName</key>
-	<string></string>
+	<string>KiCad</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt
index 5e3570a774..c28fe54740 100644
--- a/pcbnew/CMakeLists.txt
+++ b/pcbnew/CMakeLists.txt
@@ -4,6 +4,15 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
                     ${Boost_INCLUDE_DIR}
                     ../3d-viewer
                     ../polygon)
+##
+# Name of target on OSX is also the title of the application
+# on other targets this should be as normal
+##
+if(APPLE)
+	set(PCBNEW_NAME PCBNew)
+else(APPLE)
+	set(PCBNEW_NAME pcbnew)
+endif(APPLE)
 
 # Many of the commented out ones are nested in *.cpp files for dialogs
 set(PCBNEW_SRCS
@@ -182,7 +191,6 @@ if(APPLE)
                                 PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
     set(MACOSX_BUNDLE_ICON_FILE pcbnew.icns)
     set(MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.pcbnew)
-    set(MACOSX_BUNDLE_NAME pcbnew)
     set(MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
 endif(APPLE)
 
@@ -203,18 +211,18 @@ set_source_files_properties( dialog_freeroute_exchange.cpp
         OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dialog_freeroute_exchange_help_html.h
     )
 
-add_executable(pcbnew WIN32 MACOSX_BUNDLE ${PCBNEW_SRCS}
+add_executable(${PCBNEW_NAME} WIN32 MACOSX_BUNDLE ${PCBNEW_SRCS}
     ${PCBNEW_EXTRA_SRCS}
     ${PCBNEW_RESOURCES}
     )
 
 if(APPLE)
-    set_target_properties(pcbnew PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
+    set_target_properties(${PCBNEW_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
 endif(APPLE)
 
-target_link_libraries(pcbnew 3d-viewer common pcbcommon polygon bitmaps kbool ${OPENGL_LIBRARIES} ${wxWidgets_LIBRARIES})
+target_link_libraries(${PCBNEW_NAME} 3d-viewer common pcbcommon polygon bitmaps kbool ${OPENGL_LIBRARIES} ${wxWidgets_LIBRARIES})
 
-install(TARGETS pcbnew
+install(TARGETS ${PCBNEW_NAME}
         DESTINATION ${KICAD_BIN}
         COMPONENT binary)
 
diff --git a/pcbnew/Info.plist b/pcbnew/Info.plist
index af353d69ff..5948bf6755 100644
--- a/pcbnew/Info.plist
+++ b/pcbnew/Info.plist
@@ -18,7 +18,7 @@
 		</dict>
 	</array>
 	<key>CFBundleExecutable</key>
-	<string>pcbnew</string>
+	<string>PCBNew</string>
 	<key>CFBundleGetInfoString</key>
 	<string></string>
 	<key>CFBundleIconFile</key>
@@ -30,7 +30,7 @@
 	<key>CFBundleLongVersionString</key>
 	<string></string>
 	<key>CFBundleName</key>
-	<string>pcbnew</string>
+	<string>PCBNew</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>