diff --git a/.gitignore b/.gitignore
index 1526a7a..77d9647 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,4 @@
 /jdk8u-arch64-jdk8u60-b24.tar.xz
 /jdk8u60-jdk8u60-b27.tar.xz
 /jdk8-aarch64-jdk8u60-b24.2.tar.xz
+/jdk8u60-aarch64-jdk8u60-b28.tar.xz
diff --git a/enableArm64.patch b/enableArm64.patch
deleted file mode 100644
index bb5863b..0000000
--- a/enableArm64.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- /dev/null
-+++ jdk8/jdk/src/solaris/bin/aarch64/jvm.cfg
-@@ -0,0 +1,2 @@
-+-server KNOWN
-+-client IGNORE
---- jdk8/common/autoconf/generated-configure.sh
-+++ jdk8/common/autoconf/generated-configure.sh
-@@ -6731,8 +6731,9 @@
- # The aliases save the names the user supplied, while $host etc.
- # will get canonicalized.
- test -n "$target_alias" &&
--  test "$program_prefix$program_suffix$program_transform_name" = \
--    NONENONEs,x,x, &&
-+  test "$target_alias" != "$host_alias" &&
-+    test "$program_prefix$program_suffix$program_transform_name" = \
-+      NONENONEs,x,x, &&
-   program_prefix=${target_alias}-
- 
-   # Figure out the build and target systems. # Note that in autoconf terminology, "build" is obvious, but "target"
-@@ -7950,6 +7963,9 @@
-   if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then
-     INCLUDE_SA=false
-   fi
-+  if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
-+     INCLUDE_SA=false
-+  fi
-   if test "x$VAR_CPU" = xppc64 ; then
-     INCLUDE_SA=false
-   fi
-@@ -29957,6 +29973,9 @@
-     s390)
-       ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}31"
-       ;;
-+    aarch64)
-+      ZERO_ARCHFLAG=""
-+       ;;
-     *)
-       ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
-   esac
---- jdk8/common/autoconf/jdk-options.m4
-+++ jdk8/common/autoconf/jdk-options.m4
-@@ -117,11 +117,6 @@
-   JVM_VARIANT_ZEROSHARK=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zeroshark,/!s/.*/false/g' -e '/,zeroshark,/s/.*/true/g'`
-   JVM_VARIANT_CORE=`$ECHO "$JVM_VARIANTS" | $SED -e '/,core,/!s/.*/false/g' -e '/,core,/s/.*/true/g'`
- 
--  if test "x$JVM_VARIANT_CLIENT" = xtrue; then
--    if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
--      AC_MSG_ERROR([You cannot build a client JVM for a 64-bit machine.])
--    fi
--  fi
-   if test "x$JVM_VARIANT_KERNEL" = xtrue; then
-     if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
-       AC_MSG_ERROR([You cannot build a kernel JVM for a 64-bit machine.])
-@@ -159,6 +154,9 @@
-     INCLUDE_SA=false
-   fi
-   if test "x$VAR_CPU" = xppc64 ; then
-+    INCLUDE_SA=false
-+  fi
-+  if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
-     INCLUDE_SA=false
-   fi
-   if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
-@@ -460,12 +458,6 @@
-     AC_MSG_ERROR([Update version must have a value])
-   elif test "x$with_update_version" != x; then
-     JDK_UPDATE_VERSION="$with_update_version"
--    # On macosx 10.7, it's not possible to set --with-update-version=0X due
--    # to a bug in expr (which reduces it to just X). To work around this, we
--    # always add a 0 to one digit update versions.
--    if test "${#JDK_UPDATE_VERSION}" = "1"; then
--      JDK_UPDATE_VERSION="0${JDK_UPDATE_VERSION}"
--    fi
-   fi
- 
-   AC_ARG_WITH(user-release-suffix, [AS_HELP_STRING([--with-user-release-suffix],
---- jdk8/common/autoconf/toolchain.m4
-+++ jdk8/common/autoconf/toolchain.m4
-@@ -1158,6 +1158,9 @@
-     s390)
-       ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}31"
-       ;;
-+    aarch64)
-+      ZERO_ARCHFLAG=""
-+      ;;
-     *)
-       ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
-   esac
---- jdk8/jdk/make/lib/SoundLibraries.gmk
-+++ jdk8/jdk/make/lib/SoundLibraries.gmk
-@@ -138,6 +138,10 @@
- 
-   ifeq ($(OPENJDK_TARGET_CPU), ppc64)
-        LIBJSOUND_CFLAGS += -DX_ARCH=X_PPC64
-+  endif
-+
-+  ifeq ($(OPENJDK_TARGET_CPU), aarch64)
-+	LIBJSOUND_CFLAGS += -DX_ARCH=X_AARCH64
-   endif
- endif
- 
---- jdk8/jdk/make/CompileJavaClasses.gmk
-+++ jdk8/jdk/make/CompileJavaClasses.gmk
-@@ -390,7 +390,7 @@
- 
- ##########################################################################################
- 
--all: $(BUILD_JDK) $(BUILD_SECURITY) $(COPY_EXTRA) \
-+all: $(BUILD_JDK) $(BUILD_SECURITY) $(BUILD_JOBJC) $(BUILD_JOBJC_HEADERS) $(COPY_EXTRA) \
-     $(JDK_OUTPUTDIR)/classes/META-INF/services/com.sun.tools.xjc.Plugin \
-     $(BUILD_ACCESSBRIDGE_32) $(BUILD_ACCESSBRIDGE_64) \
-     $(BUILD_ACCESSBRIDGE_LEGACY)
diff --git a/java-1.8.0-openjdk-rh1191652-hotspot-aarch64.patch b/java-1.8.0-openjdk-rh1191652-hotspot-aarch64.patch
index 2933063..865ecb3 100644
--- a/java-1.8.0-openjdk-rh1191652-hotspot-aarch64.patch
+++ b/java-1.8.0-openjdk-rh1191652-hotspot-aarch64.patch
@@ -10,7 +10,7 @@ Summary: Use ppc64le as the arch directory on that platform and report it in os.
 --- openjdk/hotspot/make/defs.make.orig	2015-03-03 17:05:51.000000000 -0500
 +++ openjdk/hotspot/make/defs.make	2015-03-03 19:18:20.000000000 -0500
 @@ -319,6 +319,13 @@
-   LIBARCH/arm     = arm
+   LIBARCH/ppc64   = ppc64
    LIBARCH/zero    = $(ZERO_LIBARCH)
  
 +  # Override LIBARCH for ppc64le
@@ -20,21 +20,6 @@ Summary: Use ppc64le as the arch directory on that platform and report it in os.
 +    endif
 +  endif
 +
-   LP64_ARCH = sparcv9 amd64 ppc64 aarch64 ia64 zero
+   LP64_ARCH += sparcv9 amd64 ia64 ppc64 aarch64 zero
  endif
  
-diff -r 01a0011cc101 -r 4fdaf786d977 src/os/linux/vm/os_linux.cpp
---- openjdk/hotspot/src/os/linux/vm/os_linux.cpp	Mon Feb 16 13:18:10 2015 +0000
-+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	Mon Feb 16 16:05:34 2015 +0000
-@@ -305,7 +305,11 @@
- #elif defined(PPC32)
- static char cpu_arch[] = "ppc";
- #elif defined(PPC64)
-+#if defined(VM_LITTLE_ENDIAN)
-+static char cpu_arch[] = "ppc64le";
-+#else
- static char cpu_arch[] = "ppc64";
-+#endif
- #elif defined(SPARC)
- #  ifdef _LP64
- static char cpu_arch[] = "sparcv9";
diff --git a/java-1.8.0-openjdk-rh1191652-hotspot.patch b/java-1.8.0-openjdk-rh1191652-hotspot.patch
deleted file mode 100644
index dd76f2d..0000000
--- a/java-1.8.0-openjdk-rh1191652-hotspot.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -r 9d6eb2757167 make/defs.make
---- openjdk/hotspot/make/defs.make	Wed Feb 11 18:56:26 2015 -0800
-+++ openjdk/hotspot/make/defs.make	Tue Feb 17 16:39:22 2015 +0000
-@@ -317,6 +317,13 @@
-   LIBARCH/ppc64   = ppc64
-   LIBARCH/zero    = $(ZERO_LIBARCH)
- 
-+  # Override LIBARCH for ppc64le
-+  ifeq ($(ARCH), ppc64)
-+    ifeq ($(OPENJDK_TARGET_CPU_ENDIAN), little)
-+      LIBARCH = ppc64le
-+    endif
-+  endif
-+
-   LP64_ARCH += sparcv9 amd64 ia64 ppc64 zero
- endif
- 
\ No newline at end of file
diff --git a/java-1.8.0-openjdk-rh1191652-jdk.patch b/java-1.8.0-openjdk-rh1191652-jdk.patch
index e32ffb6..b6fb673 100644
--- a/java-1.8.0-openjdk-rh1191652-jdk.patch
+++ b/java-1.8.0-openjdk-rh1191652-jdk.patch
@@ -15,9 +15,9 @@ diff -r 87c95759b92b src/share/native/com/sun/media/sound/SoundDefs.h
 --- openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h	Wed Feb 11 18:55:05 2015 -0800
 +++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h	Tue Feb 17 18:25:01 2015 +0000
 @@ -43,6 +43,8 @@
- #define X_ZERO          6
  #define X_ARM           7
  #define X_PPC           8
+ #define X_AARCH64	9
 +#define X_PPC64         9
 +#define X_PPC64LE      10
  
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index b7f9913..db52658 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -117,10 +117,9 @@
 # Standard JPackage naming and versioning defines.
 %global origin          openjdk
 %global updatever       60
-%global buildver        b27
-%global aarch64_updatever 60
-%global aarch64_buildver b24.2
-%global aarch64_changesetid aarch64-jdk8u%{aarch64_updatever}-%{aarch64_buildver}
+%global buildver        b28
+%global aarch64_updatever %{updatever}
+%global aarch64_buildver  %{buildver}
 # priority must be 7 digits in total
 %global priority        18000%{updatever}
 %global javaver         1.8.0
@@ -661,7 +660,7 @@ Obsoletes: java-1.7.0-openjdk-accessibility%1
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{updatever}
-Release: 14.%{buildver}%{?dist}
+Release: 15.%{buildver}%{?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
@@ -680,10 +679,9 @@ License:  ASL 1.1 and ASL 2.0 and GPL+ and GPLv2 and GPLv2 with exceptions and L
 URL:      http://openjdk.java.net/
 
 # Source from upstrem OpenJDK8 project. To regenerate, use
-# ./generate_source_tarball.sh jdk8u jdk8u jdk8u%%{updatever}-%%{buildver}
-# ./generate_source_tarball.sh aarch64-port jdk8 %%{aarch64_hg_tag}
-Source0:  jdk8u60-jdk8u%{updatever}-%{buildver}.tar.xz
-Source1:  jdk8-%{aarch64_changesetid}.tar.xz
+# aarch64-port now contains integration forest of both aarch64 and normal jdk
+# ./generate_source_tarball.sh aarch64-port jdk8u60 aarch64-jdk8u60-b28
+Source0:  jdk8u60-aarch64-jdk8u%{updatever}-%{buildver}.tar.xz
 
 # Custom README for -src subpackage
 Source2:  README.src
@@ -754,13 +752,10 @@ Patch504: rh1163501.patch
 Patch511: rh1214835.patch
 
 # RH1191652; fix name of ppc64le architecture
-Patch600: %{name}-rh1191652-hotspot.patch
 Patch601: %{name}-rh1191652-root.patch
 Patch602: %{name}-rh1191652-jdk.patch
 Patch603: %{name}-rh1191652-hotspot-aarch64.patch
 
-Patch9999: enableArm64.patch
-
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: alsa-lib-devel
@@ -989,15 +984,6 @@ if [ $prioritylength -ne 7 ] ; then
  exit 14
 fi
 # For old patches
-# Swap HotSpot for AArch64 port
-%ifarch %{aarch64}
-#pushd openjdk
-#rm -r hotspot
-# tmp - containing whole aarch64 forest
-rm -r openjdk
-tar xf %{SOURCE1}
-#popd
-%endif
 ln -s openjdk jdk8
 
 cp %{SOURCE2} .
@@ -1014,19 +1000,10 @@ cp %{SOURCE101} openjdk/common/autoconf/build-aux/
 # Remove libraries that are linked
 sh %{SOURCE12}
 
-#pure aarch64 forest does not have them
-%ifnarch %{aarch64}
-# Add AArch64 support to configure & JDK build
-%patch9999
-%endif
-
 %patch201
 %patch202
 %patch203
 
-%ifnarch %{aarch64}
-%endif
-
 %patch1
 %patch3
 %patch4
@@ -1044,19 +1021,10 @@ sh %{SOURCE12}
 # Zero PPC fixes.
 %patch403
 
-# HotSpot ppc64le patch is different depending
-# on whether we are using 2.5 or 2.6 HotSpot.
-%ifarch %{aarch64}
 %patch603
-%else
-%patch600
-%endif
-
-#pure aarch64 forest does not have them
-%ifnarch %{aarch64}
 %patch601
 %patch602
-%endif
+
 
 %patch504
 %patch511
@@ -1150,7 +1118,7 @@ bash ../../configure \
     --with-update-version=%{updatever} \
     --with-build-number=%{buildver} \
 %ifarch %{aarch64}
-    --with-user-release-suffix="aarch64-%{aarch64_updatever}-%{aarch64_buildver}-%{aarch64_changesetid}" \
+    --with-user-release-suffix="aarch64-%{aarch64_updatever}-%{aarch64_buildver}" \
 %endif
     --with-boot-jdk=/usr/lib/jvm/java-openjdk \
     --with-debug-level=$debugbuild \
@@ -1744,6 +1712,11 @@ end
 %endif
 
 %changelog
+* Thu Oct 15 2015 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.60-15.b28
+- moved to single source integration forest
+- removed patch patch9999 enableArm64.patch
+- removed patch patch600  %%{name}-rh1191652-hotspot.patch
+
 * Thu Aug 27 2015 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.60-14.b24
 - updated aarch64 tarball to contain whole forest of latest jdk8-aarch64-jdk8u60-b24.2.tar.xz
 - using this forest instead of only hotspot
diff --git a/sources b/sources
index d502d0b..9e54e85 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
 94ca5a45c3cb3b85c4577d0891166007  systemtap-tapset.tar.gz
-58a0f9a606680947dc10c9140f1966da  jdk8-aarch64-jdk8u60-b24.2.tar.xz
-68efe6afc657ac8d066e0c4db1f16606  jdk8u60-jdk8u60-b27.tar.xz
+f7f25b31a29e5230407b08a8f3f8ce1d  jdk8u60-aarch64-jdk8u60-b28.tar.xz