diff --git a/.gitignore b/.gitignore
index f03e270..d6e37f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,4 @@
 /aarch64-hotspot-jdk8u40-b02.tar.xz
 /aarch64-hotspot-jdk8u40-b02-c6375c27cbfa.tar.xz
 /aarch64-hotspot-jdk8u40-b04-a6df78e590bb.tar.xz
+/jdk8-jdk8u40-b12-aarch64.tar.xz
diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
index 4673921..72914fe 100755
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@@ -46,7 +46,12 @@ rm  "${VERSION}.tar.gz"
 mv "${REPO_NAME}-${VERSION}" jdk8
 pushd jdk8
 
-for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn
+repos="corba hotspot jdk jaxws jaxp langtools nashorn"
+if [ aarch64-port = $PROJECT_NAME ] ; then
+repos="hotspot"
+fi;
+
+for subrepo in $repos
 do
     wget "${REPO_ROOT}/${subrepo}/archive/${VERSION}.tar.gz"
     tar xf "${VERSION}.tar.gz"
@@ -54,8 +59,9 @@ do
     mv "${subrepo}-${VERSION}" "${subrepo}"
 done
 
-rm -vr jdk/src/share/native/sun/security/ec/impl
-
+if [ -e jdk ] ; then 
+  rm -vr jdk/src/share/native/sun/security/ec/impl
+fi
 popd
 
 tar cJf ${REPO_NAME}-${VERSION}.tar.xz jdk8
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index e3a4e8d..95b5701 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -117,8 +117,8 @@
 %global updatever       40
 %global buildver        b02
 %global aarch64_updatever 40
-%global aarch64_buildver b04
-%global aarch64_changesetid a6df78e590bb
+%global aarch64_buildver b12
+%global aarch64_changesetid aarch64
 # priority must be 6 digits in total
 %global priority        18000%{updatever}
 %global javaver         1.8.0
@@ -654,7 +654,7 @@ URL:      http://openjdk.java.net/
 # ./generate_source_tarball.sh jdk8u jdk8u jdk8u%%{updatever}-%%{buildver}
 # ./generate_source_tarball.sh aarch64-port jdk8 %%{aarch64_hg_tag}
 Source0:  jdk8u-jdk8u%{updatever}-%{buildver}.tar.xz
-Source1:  aarch64-hotspot-jdk8u%{aarch64_updatever}-%{aarch64_buildver}-%{aarch64_changesetid}.tar.xz
+Source1:  jdk8-jdk8u%{aarch64_updatever}-%{aarch64_buildver}-%{aarch64_changesetid}.tar.xz
 
 # Custom README for -src subpackage
 Source2:  README.src
@@ -944,7 +944,7 @@ else
   exit 12
 fi
 if [ %{include_debug_build} -eq 0 -a  %{include_normal_build} -eq 0 ] ; then
-  echo "you have disabled both include_debug_build and enclude_debug_build. no go."
+  echo "you have disabled both include_debug_build and include_debug_build. no go."
   exit 13
 fi
 %setup -q -c -n %{uniquesuffix ""} -T -a 0
diff --git a/sources b/sources
index fe8a12d..6cd89b4 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 78d96904ad6d9a7cee76849b0e49b6f0  jdk8u-jdk8u40-b02.tar.xz
 94ca5a45c3cb3b85c4577d0891166007  systemtap-tapset.tar.gz
-8a9d561065f55762cafd9f475b26cf68  aarch64-hotspot-jdk8u40-b04-a6df78e590bb.tar.xz
+569aec261b39eff9e282792fb35cfb57  jdk8-jdk8u40-b12-aarch64.tar.xz