Index: src/org/openstreetmap/josm/gui/MainMenu.java
===================================================================
--- src/org/openstreetmap/josm/gui/MainMenu.java	(revision 998)
+++ src/org/openstreetmap/josm/gui/MainMenu.java	(working copy)
@@ -150,9 +152,11 @@
 		current.setAccelerator(download.shortCut);
 		current = fileMenu.add(upload);
 		current.setAccelerator(upload.shortCut);
+		if (!Main.withOSXIntegration) {
 		fileMenu.addSeparator();
 		current = fileMenu.add(exit);
 		current.setAccelerator(exit.shortCut);
+		}
 		add(fileMenu);

 		editMenu.setMnemonic('E');
@@ -179,9 +183,11 @@
 		editMenu.addSeparator();
 		current = editMenu.add(search);
 		current.setAccelerator(search.shortCut);
+		if (!Main.withOSXIntegration) {
 		editMenu.addSeparator();
 		current = editMenu.add(preferences);
 		current.setAccelerator(preferences.shortCut);
+		}
 		add(editMenu);

 		viewMenu.setMnemonic('V');
@@ -273,8 +281,10 @@
 		current = helpMenu.add(check);
 		current = helpMenu.add(help);
 		//current.setAccelerator(help.shortCut);
+		if (!Main.withOSXIntegration) {
 		current = helpMenu.add(about);
 		current.setAccelerator(about.shortCut);
+		}
 		current = helpMenu.add(historyinfo);
 		current.setAccelerator(historyinfo.shortCut);
 		add(helpMenu);