diff --git a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/pom.xml
index 0e0ee14..bfe4eb2 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/pom.xml
@@ -27,5 +27,8 @@
 
   <properties>
     <launcher-binary.version>1500</launcher-binary.version>
+    <os>aix</os>
+    <ws>gtk</ws>
+    <arch>ppc</arch>
   </properties>
 </project>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/pom.xml
index aa5dfaa..92e1d9d 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/pom.xml
@@ -27,5 +27,8 @@
 
   <properties>
     <launcher-binary.version>1500</launcher-binary.version>
+    <os>aix</os>
+    <ws>gtk</ws>
+    <arch>ppc64</arch>
   </properties>
 </project>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/pom.xml
index fe0eddd..f2fd40d 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/pom.xml
@@ -27,6 +27,9 @@
 
   <properties>
     <launcher-binary.version>1500</launcher-binary.version>
+    <os>hpux</os>
+    <ws>gtk</ws>
+    <arch>ia64_32</arch>
   </properties>
 
 </project>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml
index 22d93d5..facdf70 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml
@@ -26,5 +26,8 @@
 
   <properties>
     <launcher-binary.version>1500</launcher-binary.version>
+    <os>linux</os>
+    <ws>gtk</ws>
+    <arch>ppc</arch>
   </properties>
 </project>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml
index 137ff6a..8e606f9 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml
@@ -27,5 +27,8 @@
 
   <properties>
     <launcher-binary.version>1500</launcher-binary.version>
+    <os>linux</os>
+    <ws>gtk</ws>
+    <arch>ppc64</arch>
   </properties>
 </project>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml
index 894b04c..8e70c9f 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml
@@ -23,4 +23,10 @@
   <artifactId>org.eclipse.equinox.launcher.gtk.linux.s390</artifactId>
   <version>1.1.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
+
+  <properties>
+    <os>linux</os>
+    <ws>gtk</ws>
+    <arch>s390</arch>
+  </properties>
 </project>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml
index e7fa090..e88b5e8 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml
@@ -23,4 +23,10 @@
   <artifactId>org.eclipse.equinox.launcher.gtk.linux.s390x</artifactId>
   <version>1.1.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
+
+  <properties>
+    <os>linux</os>
+    <ws>gtk</ws>
+    <arch>s390x</arch>
+  </properties>
 </project>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc/pom.xml
index dbde212..9de9fe4 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc/pom.xml
@@ -27,5 +27,8 @@
 
   <properties>
     <launcher-binary.version>1500</launcher-binary.version>
+    <os>solaris</os>
+    <ws>gtk</ws>
+    <arch>sparc</arch>
   </properties>
 </project>
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/pom.xml
index e8c92e7..c8e546e 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/pom.xml
@@ -27,5 +27,8 @@
 
   <properties>
     <launcher-binary.version>1500</launcher-binary.version>
+    <os>solaris</os>
+    <ws>gtk</ws>
+    <arch>x86</arch>
   </properties>
 </project>
diff --git a/bundles/org.eclipse.equinox.launcher.motif.aix.ppc/pom.xml b/bundles/org.eclipse.equinox.launcher.motif.aix.ppc/pom.xml
index 19d1a72..19b7fab 100644
--- a/bundles/org.eclipse.equinox.launcher.motif.aix.ppc/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.motif.aix.ppc/pom.xml
@@ -26,6 +26,9 @@
 
   <properties>
     <launcher-binary.version>1500</launcher-binary.version>
+    <os>aix</os>
+    <ws>motif</ws>
+    <arch>ppc</arch>
   </properties>
 
 </project>
diff --git a/bundles/org.eclipse.equinox.launcher.motif.hpux.ia64_32/pom.xml b/bundles/org.eclipse.equinox.launcher.motif.hpux.ia64_32/pom.xml
index 0c8bdb1..dadb632 100644
--- a/bundles/org.eclipse.equinox.launcher.motif.hpux.ia64_32/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.motif.hpux.ia64_32/pom.xml
@@ -27,6 +27,9 @@
 
   <properties>
     <launcher-binary.version>1500</launcher-binary.version>
+    <os>hpux</os>
+    <ws>motif</ws>
+    <arch>ia64_32</arch>
   </properties>
 
 </project>
diff --git a/bundles/org.eclipse.equinox.launcher.motif.linux.x86/pom.xml b/bundles/org.eclipse.equinox.launcher.motif.linux.x86/pom.xml
index 92d46b6..c81f4eb 100644
--- a/bundles/org.eclipse.equinox.launcher.motif.linux.x86/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.motif.linux.x86/pom.xml
@@ -27,5 +27,8 @@
 
   <properties>
     <launcher-binary.version>1500</launcher-binary.version>
+    <os>linux</os>
+    <ws>motif</ws>
+    <arch>x86</arch>
   </properties>
 </project>
diff --git a/bundles/org.eclipse.equinox.launcher.motif.solaris.sparc/pom.xml b/bundles/org.eclipse.equinox.launcher.motif.solaris.sparc/pom.xml
index df30227..91fa28f 100644
--- a/bundles/org.eclipse.equinox.launcher.motif.solaris.sparc/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.motif.solaris.sparc/pom.xml
@@ -27,5 +27,8 @@
 
   <properties>
     <launcher-binary.version>1500</launcher-binary.version>
+    <os>solaris</os>
+    <ws>motif</ws>
+    <arch>sparc</arch>
   </properties>
 </project>
diff --git a/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/pom.xml b/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/pom.xml
index 8dca237..1f6fea1 100644
--- a/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/pom.xml
@@ -27,5 +27,8 @@
   <properties>
     <launcher-binary.version>1500</launcher-binary.version>
     <launcher-binary.ext>dll</launcher-binary.ext>
+    <os>win32</os>
+    <ws>win32</ws>
+    <arch>ia64</arch>
   </properties>
 </project>
diff --git a/bundles/org.eclipse.equinox.launcher.wpf.win32.x86/pom.xml b/bundles/org.eclipse.equinox.launcher.wpf.win32.x86/pom.xml
index 8bf65d1..d3cd805 100644
--- a/bundles/org.eclipse.equinox.launcher.wpf.win32.x86/pom.xml
+++ b/bundles/org.eclipse.equinox.launcher.wpf.win32.x86/pom.xml
@@ -28,5 +28,8 @@
   <properties>
     <launcher-binary.version>1500</launcher-binary.version>
     <launcher-binary.ext>dll</launcher-binary.ext>
+    <os>win32</os>
+    <ws>wpf</ws>
+    <arch>x86</arch>
   </properties>
 </project>
diff --git a/pom.xml b/pom.xml
index fc9243f..9fe5bc2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,15 +35,9 @@
     
     <module>bundles/org.eclipse.equinox.executable</module>
     <module>bundles/org.eclipse.equinox.launcher</module>
-    <module>bundles/org.eclipse.equinox.launcher.gtk.linux.x86</module>
-    <module>bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64</module>
-    <module>bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64</module>
-    <module>bundles/org.eclipse.equinox.launcher.win32.win32.x86</module>
-    <module>bundles/org.eclipse.equinox.launcher.win32.win32.x86_64</module>
-
-    <!--
     <module>bundles/org.eclipse.equinox.launcher.carbon.macosx</module>
     <module>bundles/org.eclipse.equinox.launcher.cocoa.macosx</module>
+    <module>bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64</module>
     <module>bundles/org.eclipse.equinox.launcher.gtk.aix.ppc</module>
     <module>bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64</module>
     <module>bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32</module>
@@ -51,6 +45,8 @@
     <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64</module>
     <module>bundles/org.eclipse.equinox.launcher.gtk.linux.s390</module>
     <module>bundles/org.eclipse.equinox.launcher.gtk.linux.s390x</module>
+    <module>bundles/org.eclipse.equinox.launcher.gtk.linux.x86</module>
+    <module>bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64</module>
     <module>bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc</module>
     <module>bundles/org.eclipse.equinox.launcher.gtk.solaris.x86</module>
     <module>bundles/org.eclipse.equinox.launcher.motif.aix.ppc</module>
@@ -58,9 +54,10 @@
     <module>bundles/org.eclipse.equinox.launcher.motif.linux.x86</module>
     <module>bundles/org.eclipse.equinox.launcher.motif.solaris.sparc</module>
     <module>bundles/org.eclipse.equinox.launcher.win32.win32.ia64</module>
+    <module>bundles/org.eclipse.equinox.launcher.win32.win32.x86</module>
+    <module>bundles/org.eclipse.equinox.launcher.win32.win32.x86_64</module>
     <module>bundles/org.eclipse.equinox.launcher.wpf.win32.x86</module>
-    <module>features/rt.equinox.framework.site</module>
-     -->
+
     <module>bundles/org.eclipse.osgi.tests</module>
     <module>features/org.eclipse.equinox.core.sdk</module>
   </modules>