diff --git a/.gitignore b/.gitignore
index 26b9264..86f5e94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /shenandoah-jdk11-b516c8c7a0a4.tar.xz
 /shenandoah-jdk11-shenandoah-jdk-11+22.tar.xz
 /shenandoah-jdk11-shenandoah-jdk-11+28.tar.xz
+/shenandoah-jdk11-shenandoah-jdk-11.0.1+13.tar.xz
diff --git a/JDK-8210425-RHBZ-1632174-sharedRuntimeTrig-opt-fix.patch b/JDK-8210425-RHBZ-1632174-sharedRuntimeTrig-opt-fix.patch
index 8a3a0d8..843ae3c 100644
--- a/JDK-8210425-RHBZ-1632174-sharedRuntimeTrig-opt-fix.patch
+++ b/JDK-8210425-RHBZ-1632174-sharedRuntimeTrig-opt-fix.patch
@@ -10,8 +10,8 @@ Reviewed-by: duke
 diff --git a/make/hotspot/lib/JvmOverrideFiles.gmk b/make/hotspot/lib/JvmOverrideFiles.gmk
 --- a/make/hotspot/lib/JvmOverrideFiles.gmk
 +++ b/make/hotspot/lib/JvmOverrideFiles.gmk
-@@ -41,20 +41,26 @@
-   BUILD_LIBJVM_shenandoahTraversalGC.cpp_CXXFLAGS := --param inline-unit-growth=1000
+@@ -43,20 +43,26 @@ ifeq ($(TOOLCHAIN_TYPE), gcc)
+   endif
  endif
  
 +LIBJVM_FDLIBM_COPY_OPT_FLAG := $(CXX_O_FLAG_NONE)
@@ -40,9 +40,9 @@ diff --git a/make/hotspot/lib/JvmOverrideFiles.gmk b/make/hotspot/lib/JvmOverrid
 -    endif
 +  ifeq ($(TOOLCHAIN_TYPE), clang)
 +    JVM_PRECOMPILED_HEADER_EXCLUDE := \
-+	sharedRuntimeTrig.cpp \
-+	sharedRuntimeTrans.cpp \
-+	#
++       sharedRuntimeTrig.cpp \
++       sharedRuntimeTrans.cpp \
++       #
    endif
  
    ifeq ($(OPENJDK_TARGET_CPU), x86)
diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index e978455..f7e2e34 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -189,7 +189,7 @@
 
 # New Version-String scheme-style defines
 %global majorver 11
-%global securityver 0
+%global securityver 1
 # Used via new version scheme. JDK 11 was
 # GA'ed in September 2018 => 18.9
 %global vendor_version_string 18.9
@@ -199,7 +199,7 @@
 %global origin_nice     OpenJDK
 %global top_level_dir_name   %{origin}
 %global minorver        0
-%global buildver        28
+%global buildver        13
 # priority must be 7 digits in total
 # setting to 1, so debug ones can have 0
 %global priority        00000%{minorver}1
@@ -841,7 +841,7 @@ Provides: java-%{javaver}-%{origin}-src%{?1} = %{epoch}:%{version}-%{release}
 
 Name:    java-%{javaver}-%{origin}
 Version: %{newjavaver}.%{buildver}
-Release: 2%{?dist}
+Release: 1%{?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
@@ -876,7 +876,7 @@ URL:      http://openjdk.java.net/
 
 # to regenerate source0 (jdk) and source8 (jdk's taspets) run update_package.sh
 # update_package.sh contains hard-coded repos, revisions, tags, and projects to regenerate the source archives
-Source0: shenandoah-jdk%{majorver}-shenandoah-jdk-%{majorver}+%{buildver}.tar.xz
+Source0: shenandoah-jdk%{majorver}-shenandoah-jdk-%{newjavaver}+%{buildver}.tar.xz
 Source8: systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
 
 # Desktop files. Adapted from IcedTea
@@ -1537,7 +1537,7 @@ popd
 # Install Javadoc documentation
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
 cp -a %{buildoutputdir -- $suffix}/images/docs $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}
-cp -a %{buildoutputdir -- $suffix}/bundles/jdk-%{majorver}+%{buildver}-docs.zip  $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
+cp -a %{buildoutputdir -- $suffix}/bundles/jdk-%{newjavaver}+%{buildver}-docs.zip  $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
 
 # Install icons and menu entries
 for s in 16 24 32 48 ; do
@@ -1767,6 +1767,9 @@ require "copy_jdk_configs.lua"
 
 
 %changelog
+* Thu Oct 18 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:11.0.1.13-1
+- Update to October 2018 CPU release, 11.0.1+13.
+
 * Wed Oct 17 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:11.0.0.28-2
 - Use --with-vendor-version-string=18.9 so as to show original
   GA date for the JDK.
diff --git a/sources b/sources
index 104c218..5a4c26a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) = cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d
-SHA512 (shenandoah-jdk11-shenandoah-jdk-11+28.tar.xz) = 4ca6a69cb1b67dd6749861de5f49e50a43c9c7a6100d4b55c722960fec90bb280dc995be7d76e9b2d4519ce0d8fef54c25be8e9b33b80d6c6ec9130ef166e4ee
+SHA512 (shenandoah-jdk11-shenandoah-jdk-11.0.1+13.tar.xz) = e5e2ffd022ee2f0311efc17de2ad7585676aac5e23fe4de821651b859f432af63da14ce356eaae0538583e58ea3de397969170ef02bbcc37b0de12da238879db
diff --git a/update_package.sh b/update_package.sh
index 7b47a26..868a52d 100644
--- a/update_package.sh
+++ b/update_package.sh
@@ -35,7 +35,7 @@ fi
 export PROJECT_NAME="shenandoah"
 export REPO_NAME="jdk11"
 # warning, clonning without shenadnaoh suffix, you will clone pure jdk - thus without shenandaoh GC
-export VERSION="shenandoah-jdk-11+28"
+export VERSION="shenandoah-jdk-11.0.1+13"
 export COMPRESSION=xz
 # unset tapsets overrides
 export OPENJDK_URL=""