--- app/gui/gui.c.orig	2010-08-07 22:26:43.000000000 +0200
+++ app/gui/gui.c	2010-08-07 22:25:34.000000000 +0200
@@ -79,7 +79,11 @@
 #include "splash.h"
 #include "themes.h"
 #ifdef GDK_WINDOWING_QUARTZ
-#include "ige-mac-menu.h"
+#ifndef __x86_64__
+#include <ige-mac-menu.h>
+#else
+#include <igemacintegration/gtkosxapplication.h>
+#endif
 #endif /* GDK_WINDOWING_QUARTZ */
 
 #include "gimp-intl.h"
@@ -457,6 +461,7 @@
   gimp_ui_manager_update (image_ui_manager, NULL);
 
 #ifdef GDK_WINDOWING_QUARTZ
+#ifndef __x86_64__ 
   {
     IgeMacMenuGroup *group;
     GtkWidget       *menu;
@@ -501,6 +506,43 @@
     if (GTK_IS_MENU_ITEM (item))
       ige_mac_menu_add_app_menu_item (group, GTK_MENU_ITEM (item), NULL);
   }
+#else
+  {
+    GtkOSXApplication * theApp;
+    GtkWidget * item;
+    GtkOSXApplicationMenuGroup * group;
+    GtkWidget * menu;
+	
+    theApp = g_object_new(GTK_TYPE_OSX_APPLICATION, NULL);
+	  
+    	  
+    menu = gtk_ui_manager_get_widget (GTK_UI_MANAGER (image_ui_manager),"/dummy-menubar/image-popup");
+    if (GTK_IS_MENU_ITEM (menu))
+      menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menu));
+
+	gtk_osxapplication_set_menu_bar(theApp, GTK_MENU_SHELL(menu));
+	gtk_osxapplication_set_use_quartz_accelerators(theApp, TRUE);
+	  
+    group = gtk_osxapplication_add_app_menu_group (theApp);
+    item = gtk_ui_manager_get_widget (GTK_UI_MANAGER (image_ui_manager),"/dummy-menubar/image-popup/Help/dialogs-about");
+    if (GTK_IS_MENU_ITEM (item))
+      gtk_osxapplication_add_app_menu_item(theApp, group,GTK_MENU_ITEM (item));
+	  
+    group = gtk_osxapplication_add_app_menu_group (theApp);
+    item = gtk_ui_manager_get_widget (GTK_UI_MANAGER (image_ui_manager),"/dummy-menubar/image-popup/Edit/Preferences/dialogs-preferences");
+    if (GTK_IS_MENU_ITEM (item))
+      gtk_osxapplication_add_app_menu_item(theApp, group,GTK_MENU_ITEM (item));
+	  
+    item = gtk_ui_manager_get_widget (GTK_UI_MANAGER (image_ui_manager),"/dummy-menubar/image-popup/Edit/Preferences/dialogs-keyboard-shortcuts");
+    if (GTK_IS_MENU_ITEM (item))
+      gtk_osxapplication_add_app_menu_item(theApp, group,GTK_MENU_ITEM (item));
+	
+    item = gtk_ui_manager_get_widget (GTK_UI_MANAGER (image_ui_manager),"/dummy-menubar/image-popup/Edit/Preferences/plug-in-unit-editor");
+    if (GTK_IS_MENU_ITEM (item))
+      gtk_osxapplication_add_app_menu_item(theApp, group,GTK_MENU_ITEM (item));
+    
+  }
+#endif
 #endif /* GDK_WINDOWING_QUARTZ */
 
   g_signal_connect_object (gui_config, "notify::single-window-mode",
