diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/build.properties b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/build.properties
index cf0ede8..c28eb1a 100644
--- a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/build.properties
@@ -15,4 +15,4 @@
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20141204-1022
+binaryTag=v20141210-0418
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/build.properties
index f126b05..5ddaa98 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/build.properties
@@ -15,4 +15,4 @@
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20141204-1022
+binaryTag=v20141210-0418
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/build.properties
index 183ff80..0d0a856 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/build.properties
@@ -15,4 +15,4 @@
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20141204-1022
\ No newline at end of file
+binaryTag=v20141210-0418
\ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/build.properties
index ee10da4..3f824a5 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/build.properties
@@ -15,4 +15,4 @@
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20141204-1022
+binaryTag=v20141210-0418
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/build.properties
index 4410707..bb08fae 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/build.properties
@@ -15,4 +15,4 @@
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20141204-1022
+binaryTag=v20141210-0418
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/build.properties
index 195ca2e..314e22f 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/build.properties
@@ -15,4 +15,4 @@
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20141204-1022
+binaryTag=v20141210-0418
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/build.properties
index 3199f0c..5b377e1 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/build.properties
@@ -15,4 +15,4 @@
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20141204-1022
+binaryTag=v20141210-0418
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/build.properties
index 6a44d31..7c83271 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/build.properties
@@ -15,4 +15,4 @@
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20141204-1022
\ No newline at end of file
+binaryTag=v20141210-0418
\ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/build.properties
index 382a639..021e890 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/build.properties
@@ -15,4 +15,4 @@
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20141204-1022
\ No newline at end of file
+binaryTag=v20141210-0418
\ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/build.properties
index bc2b43f..dc06c86 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/build.properties
@@ -15,4 +15,4 @@
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20141204-1022
+binaryTag=v20141210-0418
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/build.properties
index d85bcd2..0f66ebc 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/build.properties
@@ -15,4 +15,4 @@
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20141204-1022
+binaryTag=v20141210-0418
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc/build.properties
index c8e244d..b8750a1 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc/build.properties
@@ -15,4 +15,4 @@
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20141204-1022
+binaryTag=v20141210-0418
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/build.properties
index bef5933..d447dd9 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/build.properties
@@ -15,4 +15,4 @@
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20141204-1022
+binaryTag=v20141210-0418
diff --git a/bundles/org.eclipse.equinox.launcher.motif.aix.ppc/build.properties b/bundles/org.eclipse.equinox.launcher.motif.aix.ppc/build.properties
index 499bdf3..4c1fcfe 100644
--- a/bundles/org.eclipse.equinox.launcher.motif.aix.ppc/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.motif.aix.ppc/build.properties
@@ -16,4 +16,4 @@
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false               
-binaryTag=v20141204-1022
+binaryTag=v20141210-0418
diff --git a/bundles/org.eclipse.equinox.launcher.motif.hpux.ia64_32/build.properties b/bundles/org.eclipse.equinox.launcher.motif.hpux.ia64_32/build.properties
index e0d88f7..f04e835 100644
--- a/bundles/org.eclipse.equinox.launcher.motif.hpux.ia64_32/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.motif.hpux.ia64_32/build.properties
@@ -15,4 +15,4 @@
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20141204-1022
+binaryTag=v20141210-0418
diff --git a/bundles/org.eclipse.equinox.launcher.motif.linux.x86/build.properties b/bundles/org.eclipse.equinox.launcher.motif.linux.x86/build.properties
index 2b1ad30..6ad3521 100644
--- a/bundles/org.eclipse.equinox.launcher.motif.linux.x86/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.motif.linux.x86/build.properties
@@ -15,4 +15,4 @@
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20141204-1022
+binaryTag=v20141210-0418
diff --git a/bundles/org.eclipse.equinox.launcher.motif.solaris.sparc/build.properties b/bundles/org.eclipse.equinox.launcher.motif.solaris.sparc/build.properties
index 128cfe0..f7e4ec1 100644
--- a/bundles/org.eclipse.equinox.launcher.motif.solaris.sparc/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.motif.solaris.sparc/build.properties
@@ -15,4 +15,4 @@
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20141204-1022
+binaryTag=v20141210-0418
diff --git a/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/build.properties b/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/build.properties
index e80fccf..91977f2 100644
--- a/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/build.properties
@@ -14,4 +14,4 @@
                about.html
 generateSourceBundle=false
 customBuildCallbacks=customBuildCallbacks.xml
-binaryTag=v20141204-1022
\ No newline at end of file
+binaryTag=v20141210-0418
\ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.launcher.win32.win32.x86/build.properties b/bundles/org.eclipse.equinox.launcher.win32.win32.x86/build.properties
index 6a0da32..1ad3752 100644
--- a/bundles/org.eclipse.equinox.launcher.win32.win32.x86/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.win32.win32.x86/build.properties
@@ -14,4 +14,4 @@
                about.html
 generateSourceBundle=false
 customBuildCallbacks=customBuildCallbacks.xml
-binaryTag=v20141204-1022
\ No newline at end of file
+binaryTag=v20141210-0418
\ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/build.properties b/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/build.properties
index 5967f9d..bf13a58 100644
--- a/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/build.properties
@@ -14,4 +14,4 @@
                about.html
 generateSourceBundle=false
 customBuildCallbacks=customBuildCallbacks.xml
-binaryTag=v20141204-1022
+binaryTag=v20141210-0418
diff --git a/bundles/org.eclipse.equinox.launcher.wpf.win32.x86/build.properties b/bundles/org.eclipse.equinox.launcher.wpf.win32.x86/build.properties
index eff8df2..d208293 100644
--- a/bundles/org.eclipse.equinox.launcher.wpf.win32.x86/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.wpf.win32.x86/build.properties
@@ -15,4 +15,4 @@
                about.html
 generateSourceBundle=false
 customBuildCallbacks=customBuildCallbacks.xml
-binaryTag=v20141204-1022
+binaryTag=v20141210-0418
diff --git a/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh b/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
index 7d47680..b36f21d 100644
--- a/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
+++ b/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
@@ -211,8 +211,15 @@
 	fi
 	export M_ARCH
 elif [ "$defaultOSArch" = "s390" ];  then
+	if [ "${JAVA_HOME}" = "" ]; then
+		export JAVA_HOME="/home/swtbuild/java5/s390/ibm-java2-s390-50"
+	fi
 	M_ARCH=-m31
 	export M_ARCH
+elif [ "$defaultOSArch" = "s390x" ];  then
+	if [ "${JAVA_HOME}" = "" ]; then
+		export JAVA_HOME="/home/swtbuild/java5/s390x/ibm-java2-s390x-50"
+	fi
 elif [ "$defaultOSArch" = "ia64" ];  then
 	M_ARCH=-mlp64
 	export M_ARCH