diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
index de2696d..a9c70bd 100755
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@@ -10,7 +10,8 @@ if test "x${VERSION}" = "x"; then
     exit -1;
 fi
 
-for REPO_NAME in jdk8 aarch64-port
+#for REPO_NAME in jdk8 aarch64-port
+for REPO_NAME in aarch64-port
 do
     mkdir ${REPO_NAME}
     pushd ${REPO_NAME}
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 368e107..9eaec2d 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -142,7 +142,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 0.11.%{jdk8_version}%{?dist}
+Release: 0.12.%{jdk8_version}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -444,6 +444,9 @@ pushd %{buildoutputdir}
 bash ../../configure \
 %ifnarch %{jit_arches}
     --with-jvm-variants=zero \
+%endif
+%ifarch %{aarch64}
+    --with-jvm-variants=client \
 %endif
     --with-build-number=%{buildver} \
     --with-boot-jdk=/usr/lib/jvm/java-openjdk \
@@ -935,6 +938,9 @@ exit 0
 %doc %{buildoutputdir}/images/j2sdk-image/jre/LICENSE
 
 %changelog
+* Fri Jul 25 2013 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.0-0.12.b89
+- ifarchaarch64 then --with-jvm-variants=client
+
 * Tue Jul 23 2013 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.0-0.11.b89
 - prelink dependence excluded also for aaech64
 - arm64 added to jitarches