diff --git a/.gitignore b/.gitignore
index 23fda4c..0417c60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@
 /jdk8-jdk8u40-b12-aarch64.tar.xz
 /jdk8u-jdk8u40-b12.tar.xz
 /jdk8-jdk8u40-b12-aarch64-1263.tar.xz
+/jdk8u40-jdk8u40-b25.tar.xz
diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
index 72914fe..6011bbd 100755
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@@ -5,6 +5,7 @@
 # Usage: generate_source_tarball.sh project_name repo_name tag
 #
 # Examples:
+#  sh generate_source_tarball.sh jdk8u jdk8u40 jdk8u40-b25
 #   ./generate_source_tarball.sh jdk8 jdk8 jdk8-b79
 #   ./generate_source_tarball.sh jdk8u jdk8u jdk8u5-b13
 #   ./generate_source_tarball.sh aarch64-port jdk8 aarch64-${DATE}
diff --git a/hotspot-build-j-directive.patch b/hotspot-build-j-directive.patch
deleted file mode 100644
index 0ab9d60..0000000
--- a/hotspot-build-j-directive.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1398183426 -3600
-# Node ID b4ea3a87f707e674a144e805084bda0f72ad4e38
-# Parent  00aa9f5a26b9e2c7bdca547201106f76e23a8c01
-Don't substitute 'j' for '-j' inside -I directives
-
---- jdk8/hotspot/make/linux/makefiles/adjust-mflags.sh	Tue Apr 22 17:15:43 2014 +0100
-+++ jdk8/hotspot/make/linux/makefiles/adjust-mflags.sh	Tue Apr 22 17:17:06 2014 +0100
-@@ -64,7 +64,7 @@
- 	echo "$MFLAGS" \
- 	| sed '
- 		s/^-/ -/
--		s/ -\([^ 	][^ 	]*\)j/ -\1 -j/
-+		s/ -\([^ 	I][^ 	]*\)j/ -\1 -j/
- 		s/ -j[0-9][0-9]*/ -j/
- 		s/ -j\([^ 	]\)/ -j -\1/
- 		s/ -j/ -j'${HOTSPOT_BUILD_JOBS:-${default_build_jobs}}'/
-
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 17c8e7f..da19277 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -114,7 +114,7 @@
 # Standard JPackage naming and versioning defines.
 %global origin          openjdk
 %global updatever       40
-%global buildver        b12
+%global buildver        b25
 %global aarch64_updatever 40
 %global aarch64_buildver b12
 %global aarch64_changesetid aarch64-1263
@@ -637,7 +637,7 @@ Obsoletes: java-1.7.0-openjdk-accessibility%1
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{updatever}
-Release: 19.%{buildver}%{?dist}
+Release: 20.%{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
@@ -657,7 +657,7 @@ 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:  jdk8u-jdk8u%{updatever}-%{buildver}.tar.xz
+Source0:  jdk8u40-jdk8u%{updatever}-%{buildver}.tar.xz
 Source1:  jdk8-jdk8u%{aarch64_updatever}-%{aarch64_buildver}-%{aarch64_changesetid}.tar.xz
 
 # Custom README for -src subpackage
@@ -702,7 +702,6 @@ Patch6: disable-doclint-by-default.patch
 # Include all sources in src.zip
 Patch7: include-all-srcs.patch
 # Problem discovered with make 4.0
-Patch11: hotspot-build-j-directive.patch
 Patch12: removeSunEcProvider-RH1154143.patch
 Patch13: libjpeg-turbo-1.4-compat.patch
 
@@ -986,7 +985,6 @@ sh %{SOURCE12}
 %patch5
 %patch6
 %patch7
-%patch11
 %patch12
 %patch13
 
@@ -1670,6 +1668,10 @@ end
 
 
 %changelog
+* Thu Feb 12 2015 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.40-20.b25
+- bumped to b25
+- removed upstreamed patch11 hotspot-build-j-directive.patch
+
 * Fri Jan 09 2015 Dan Horák <dan[at]danny.cz> - 1:1.8.0.40-19.b12
 - refresh s390 patches
 
diff --git a/sources b/sources
index 647b374..7675598 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-130887ef910f2bcdb0a1759e3e42d9ed  jdk8u-jdk8u40-b12.tar.xz
+3a7c67223ec3d78d5d36f3ead9d37718  jdk8u40-jdk8u40-b25.tar.xz
 94ca5a45c3cb3b85c4577d0891166007  systemtap-tapset.tar.gz
 f3ac4f72d7563cbba4f25751056a9bc3  jdk8-jdk8u40-b12-aarch64-1263.tar.xz