diff --git a/37bde23c96f6.tar.bz2 b/37bde23c96f6.tar.bz2
deleted file mode 100644
index d67eeb0..0000000
--- a/37bde23c96f6.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a11b2244e564cb2032de38c287cabb0465261a650dc932dbf39542764e0d4f16
-size 1017673
diff --git a/5c1d6da1445a.tar.bz2 b/5c1d6da1445a.tar.bz2
new file mode 100644
index 0000000..b2f0975
--- /dev/null
+++ b/5c1d6da1445a.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b24dd2918dd8e9093e6c7ea6d0bf8929cb1bec698dbaeaafdbca09a0d661222c
+size 2353411
diff --git a/5e6d409a7232.tar.bz2 b/5e6d409a7232.tar.bz2
deleted file mode 100644
index c7710cb..0000000
--- a/5e6d409a7232.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:38c5e3a176f58922efa04a24d2d60813eb726875aa00808cbaa43cc2ed4dce00
-size 2354048
diff --git a/7025a2c10ea4.tar.bz2 b/7025a2c10ea4.tar.bz2
deleted file mode 100644
index 7b4d00c..0000000
--- a/7025a2c10ea4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bea93e8d4e7249c34a3fb2de1476235e7ff3886e7c8807851478297f66317171
-size 2527645
diff --git a/919405d7316d.tar.bz2 b/919405d7316d.tar.bz2
new file mode 100644
index 0000000..8393548
--- /dev/null
+++ b/919405d7316d.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7abc0357f2389fae57e772abe19b250ce6d95e5055a800be3517264be5028921
+size 1017813
diff --git a/938b9d502c2b.tar.bz2 b/938b9d502c2b.tar.bz2
deleted file mode 100644
index db99458..0000000
--- a/938b9d502c2b.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d283c494ba46b8aa5dcf5232405ed3ddfd294e674e2e0c61ac5323d70957e602
-size 2728015
diff --git a/a23ac9db4227.tar.bz2 b/a23ac9db4227.tar.bz2
deleted file mode 100644
index 9415834..0000000
--- a/a23ac9db4227.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1edf666d95e4889d6317b770612dae9e1f1b3a5c7f5552ac36da09383762e72c
-size 2603274
diff --git a/ad36f9454ce3.tar.bz2 b/ad36f9454ce3.tar.bz2
new file mode 100644
index 0000000..a46310d
--- /dev/null
+++ b/ad36f9454ce3.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4f60f9d22d3ab6118ed0e93e41ef449d029486fab41327724a5ce5983349f029
+size 2602994
diff --git a/b14daf2459c5.tar.bz2 b/b14daf2459c5.tar.bz2
new file mode 100644
index 0000000..2b0f925
--- /dev/null
+++ b/b14daf2459c5.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:09adf4f910a15b6050df464b3e007f117fa0a56d6ef6d8911ff0ce372842086e
+size 392479
diff --git a/b319f337ea31.tar.bz2 b/b319f337ea31.tar.bz2
deleted file mode 100644
index 5ec55c7..0000000
--- a/b319f337ea31.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ed8a2c755725a7a3843aeba890b9abd9474a73bf7adf8e3560a7a87a4b441334
-size 7920315
diff --git a/be30cb2a3088.tar.bz2 b/be30cb2a3088.tar.bz2
new file mode 100644
index 0000000..dcc7c89
--- /dev/null
+++ b/be30cb2a3088.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ac07f4be8984617fee929cd7cc70cd052686659e6beb638595319d6d34f8193d
+size 45323541
diff --git a/c5b8254a0fe2.tar.bz2 b/c5b8254a0fe2.tar.bz2
new file mode 100644
index 0000000..c81c4cb
--- /dev/null
+++ b/c5b8254a0fe2.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3ce74dcb33fdf0b29b146b6ae25f700506f5d5963a5dc23b18cbcb168f15f19f
+size 7931673
diff --git a/d1a7ea2c3e10.tar.bz2 b/d1a7ea2c3e10.tar.bz2
deleted file mode 100644
index 673aeaa..0000000
--- a/d1a7ea2c3e10.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b3ab64c5e5bf259e4ced4a9d85ff990f54e9fbc19a96b069e758ab0f780c3c66
-size 392562
diff --git a/d6ded60cfdc5.tar.bz2 b/d6ded60cfdc5.tar.bz2
new file mode 100644
index 0000000..7ef7bdb
--- /dev/null
+++ b/d6ded60cfdc5.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9bd5ed2d68221ad15ec0301a959a46050c74ee0b829f67ab34da9623de738e40
+size 2729164
diff --git a/dd229c5f57bf.tar.bz2 b/dd229c5f57bf.tar.bz2
deleted file mode 100644
index f59996e..0000000
--- a/dd229c5f57bf.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8fc1bca4bb251a6d2778e0fb36eb1c9a456361bbb2a020933a5d7dee7bc1781a
-size 45321313
diff --git a/eaa4074a7e39.tar.bz2 b/eaa4074a7e39.tar.bz2
deleted file mode 100644
index 4c03074..0000000
--- a/eaa4074a7e39.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6310688708a9ec6896a9ba8ba13f05930963e8526b6ff5c345a31a7dd28bfe40
-size 7639011
diff --git a/f09d1f6a401e.tar.bz2 b/f09d1f6a401e.tar.bz2
new file mode 100644
index 0000000..88dfec7
--- /dev/null
+++ b/f09d1f6a401e.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ec2264126452aa473974a56df3b0f09a38a90bad19b24903f6ce7aceece14050
+size 7639132
diff --git a/f3bf1b270fea.tar.bz2 b/f3bf1b270fea.tar.bz2
new file mode 100644
index 0000000..7494d7f
--- /dev/null
+++ b/f3bf1b270fea.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7ba997612fcd561dd360679b11c569a318a3af93731675501bff6bc9c5befc93
+size 2527024
diff --git a/java-1_8_0-openjdk.changes b/java-1_8_0-openjdk.changes
index 17ee0ca..0744dab 100644
--- a/java-1_8_0-openjdk.changes
+++ b/java-1_8_0-openjdk.changes
@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-Wed Aug 20 14:31:18 UTC 2014 - fstrba@suse.com
-
-- Upgrade to upstream tag jdk8u20-b26
-  * Tag corresponding to jdk8u20 public release
-
 -------------------------------------------------------------------
 Wed Jul 23 08:00:09 UTC 2014 - fstrba@suse.com
 
diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec
index 7ab86a2..2529f9c 100644
--- a/java-1_8_0-openjdk.spec
+++ b/java-1_8_0-openjdk.spec
@@ -29,20 +29,20 @@
 %global archname        %{name}
 # Standard JPackage naming and versioning defines.
 %global updatever       20
-%global buildver        b26
+%global buildver        b23
 %global root_project   jdk8u
 %global root_repository jdk8u20
-%global root_revision   d1a7ea2c3e10
-%global corba_revision  37bde23c96f6
-%global hotspot_revision eaa4074a7e39
-%global jaxp_revision   938b9d502c2b
-%global jaxws_revision  7025a2c10ea4
-%global jdk_revision    dd229c5f57bf
-%global langtools_revision 5e6d409a7232
-%global nashorn_revision a23ac9db4227
+%global root_revision   b14daf2459c5
+%global corba_revision  919405d7316d
+%global hotspot_revision f09d1f6a401e
+%global jaxp_revision   d6ded60cfdc5
+%global jaxws_revision  f3bf1b270fea
+%global jdk_revision    be30cb2a3088
+%global langtools_revision 5c1d6da1445a
+%global nashorn_revision ad36f9454ce3
 %global aarch64_project aarch64-port
 %global aarch64_repository jdk8
-%global aarch64_hotspot_revision b319f337ea31
+%global aarch64_hotspot_revision c5b8254a0fe2
 %global icedtea_sound_version 1.0.1
 # priority must be 6 digits in total
 %global priority        180%{updatever}
@@ -63,6 +63,7 @@
 %global cacerts  %{_jvmdir}/%{jredir}/lib/security/cacerts
 # real file made by update-ca-certificates
 %global javacacerts %{_var}/lib/ca-certificates/java-cacerts
+%{!?aarch64:%global aarch64 aarch64 arm64 armv8}
 %ifarch x86_64
 %global archinstall amd64
 %endif
@@ -136,7 +137,7 @@
 %global tapsetdir %{tapsetroot}/tapset/%{_build_cpu}
 %endif
 Name:           java-1_8_0-openjdk
-Version:        %{javaver}.%{updatever}
+Version:        %{javaver}.%{updatever}~%{buildver}
 Release:        0
 Summary:        OpenJDK Runtime Environment
 License:        Apache-1.1 and Apache-2.0 and GPL-1.0+ and GPL-2.0 and GPL-2.0-with-classpath-exception and LGPL-2.0 and MPL-1.0 and MPL-1.1 and SUSE-Public-Domain and W3C
@@ -256,7 +257,6 @@ Provides:       jre-openjdk = %{version}-%{release}
 # Standard JPackage extensions provides.
 Provides:       java-fonts = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%{!?aarch64:%global aarch64 aarch64 arm64 armv8}
 %if %{bootcycle}
 BuildRequires:  java-devel >= 1.6.0
 %else