diff -Naur scp2/source/ooo/aqua_ooo.scp scp2_new/source/ooo/aqua_ooo.scp
--- scp2/source/ooo/aqua_ooo.scp	1970-01-01 01:00:00.000000000 +0100
+++ scp2_new/source/ooo/aqua_ooo.scp	2007-04-20 17:22:25.000000000 +0200
@@ -0,0 +1,8 @@
+UnFile gid_File_Bin_Soffice
+UnShortcut gid_Shortcut_Spadmin_Program
+
+Shortcut gid_Shortcut_Bundle_Contents_Program
+    Dir = gid_Dir_Bundle_Contents_Macos;
+    Name = "program";
+    Styles = (NETWORK, RELATIVE );
+End
diff -Naur scp2/source/ooo/directory_ooo.scp scp2_new/source/ooo/directory_ooo.scp
--- scp2/source/ooo/directory_ooo.scp	2006-10-27 14:11:22.000000000 +0200
+++ scp2_new/source/ooo/directory_ooo.scp	2007-04-20 15:47:21.000000000 +0200
@@ -69,7 +69,11 @@
 #else
     ParentID = gid_Dir_Bundle_Contents_Macos;
 #endif
-    DosName = "program";
+    #ifndef QUARTZ
+	DosName = "program";
+    #else
+	DosName = "";
+    #endif
 End
 
 Directory gid_Dir_Program_Remote
@@ -131,7 +135,11 @@
 #ifndef MACOSX
     ParentID = PD_PROGDIR;
 #else
-    ParentID = gid_Dir_Bundle_Contents_Macos;
+    #ifdef QUARTZ
+	ParentID = gid_Dir_Bundle_Contents;
+    #else
+	ParentID = gid_Dir_Bundle_Contents_Macos;
+    #endif
 #endif
     DosName = "presets";
 End
@@ -368,7 +376,11 @@
 #ifndef MACOSX
     ParentID = PD_PROGDIR;
 #else
-    ParentID = gid_Dir_Bundle_Contents_Macos;
+    #ifdef QUARTZ
+	ParentID = gid_Dir_Bundle_Contents;
+    #else
+	ParentID = gid_Dir_Bundle_Contents_Macos;
+    #endif
 #endif
     DosName = "share";
 End
@@ -1447,7 +1459,11 @@
 #ifndef MACOSX
     ParentID = PD_PROGDIR;
 #else
-    ParentID = gid_Dir_Bundle_Contents_Macos;
+    #ifdef QUARTZ
+	ParentID = gid_Dir_Bundle_Contents;
+    #else
+	ParentID = gid_Dir_Bundle_Contents_Macos;
+    #endif
 #endif
     DosName = "help";
 End
--- scp2/source/ooo/file_ooo.scp	2007-04-11 10:44:55.000000000 +0200
+++ scp2_new/source/ooo/file_ooo.scp	2007-04-20 16:06:23.000000000 +0200
@@ -662,7 +662,11 @@
 #ifndef MACOSX
     Dir = PREDEFINED_PROGDIR;
 #else
-    Dir = gid_Dir_Bundle_Contents_Macos;
+    #ifdef QUARTZ
+	Dir = gid_Dir_Bundle_Contents;
+    #else
+	Dir = gid_Dir_Bundle_Contents_Macos;
+    #endif
 #endif
     Styles = (WORKSTATION);
     TXT_FILE_BODY;
diff -Naur scp2/source/ooo/makefile.mk scp2_new/source/ooo/makefile.mk
--- scp2/source/ooo/makefile.mk	2007-01-10 12:28:13.000000000 +0100
+++ scp2_new/source/ooo/makefile.mk	2007-04-20 14:26:16.000000000 +0200
@@ -237,6 +237,10 @@
         windowscustomaction_ooo.par
 .ENDIF
 
+.IF "$(OS)"=="MACOSX" && "$(GUIBASE)"=="aqua"
+PARFILES += aqua_ooo.par
+.ENDIF
+
 ULFFILES=                          \
         directory_ooo.ulf          \
         folderitem_ooo.ulf         \
diff -Naur scp2/util/makefile.mk scp2_new/util/makefile.mk
--- scp2/util/makefile.mk	2007-01-22 15:50:30.000000000 +0100
+++ scp2_new/util/makefile.mk	2007-04-20 14:26:17.000000000 +0200
@@ -169,6 +169,10 @@
              file_onlineupdate.par
 .ENDIF
 
+.IF "$(OS)"=="MACOSX" && "$(GUIBASE)"=="aqua"
+SCP1FILES += aqua_ooo.par
+.ENDIF
+
 # ------------------------------------------------------------------------
 # OpenOffice.org with JRE
 
@@ -291,6 +295,10 @@
              file_onlineupdate.par
 .ENDIF
 
+.IF "$(OS)"=="MACOSX" && "$(GUIBASE)"=="aqua"
+SCP2FILES += aqua_ooo.par
+.ENDIF
+
 # ------------------------------------------------------------------------
 # URE
 
diff -Naur instsetoo_native/macosx/application/Info.plist instsetoo_native_new/macosx/application/Info.plist
--- instsetoo_native/macosx/application/Info.plist	2007-02-26 15:56:50.000000000 +0100
+++ instsetoo_native_new/macosx/application/Info.plist	2007-04-20 14:26:17.000000000 +0200
@@ -458,7 +458,7 @@
 		</dict>
 	</array>
 	<key>CFBundleExecutable</key>
-	<string>droplet</string>
+	<string>%BUNDLEEXECUTABLE</string>
 	<key>CFBundleGetInfoString</key>
 	<string>OpenOffice.org %ABOUTBOXPRODUCTVERSION</string>
 	<key>CFBundleIconFile</key>
diff -Naur instsetoo_native/macosx/makefile.mk instsetoo_native_new/macosx/makefile.mk
--- instsetoo_native/macosx/makefile.mk	2007-02-26 15:56:38.000000000 +0100
+++ instsetoo_native_new/macosx/makefile.mk	2007-04-20 16:54:52.000000000 +0200
@@ -66,8 +66,10 @@
 
 .IF "$(GUIBASE)"!="aqua"
 CREATOR_TYPE=OOo2
+BUNDLEEXECUTABLE=droplet
 .ELSE
 CREATOR_TYPE=OOO2
+BUNDLEEXECUTABLE=soffice.bin
 .ENDIF
 
 # --- Targets --------------------------------------------------
@@ -94,7 +96,8 @@
 
 # Info.plist is just versioned and copied into the bundle	
 $(CONTENTS)$/%.plist : application/%.plist
-	make_versioned.sh "$<" "$@"
+	make_versioned.sh "$<" "$(VERSIONED)/$<"
+        sed "s|\%BUNDLEEXECUTABLE|${BUNDLEEXECUTABLE}|g" "$(VERSIONED)/$<" > "$@"
 
 # The InfoPlist.strings file has to be in UTF-16, thus a back-and-forth conversion
 # is needed for versioning