diff --git a/srcpkgs/oracle-jre/template b/srcpkgs/oracle-jre/template
index 8ee6325750..0f9f2f0c6b 100644
--- a/srcpkgs/oracle-jre/template
+++ b/srcpkgs/oracle-jre/template
@@ -1,9 +1,9 @@
 # Template file for 'oracle-jre'
 pkgname=oracle-jre
-version=8u20
-_longVersion=1.8.0_20
-_build=26
-revision=5
+version=8u25
+_longVersion=1.8.0_25
+_build=17
+revision=1
 short_desc="Java Runtime Environment (JRE)"
 maintainer="Enno Boland <eb@s01.de>"
 homepage="http://www.oracle.com/technetwork/java/javase/downloads/index.html"
@@ -20,12 +20,12 @@ case "${XBPS_TARGET_MACHINE}" in
 x86_64)
 	_arch=amd64
 	_filename=jre-${version}-linux-x64.tar.gz
-	checksum="23f149928ae7d7f97d9b93eb859f197744ffad2d4082a96fcde24021a08cab34"
+	checksum="fbf3b9ddd4ae534ead10411bc425a0faf460118aadff480bca366888c1cf879f"
 	;;
 i686)
 	_arch=i386
 	_filename=jre-${version}-linux-i586.tar.gz
-	checksum="340bb9bb882c90792439a3688e234c04378e03bf9cda39f1c9de2acbc3b159c1"
+	checksum="e8e879417fb8c3b7bb63955ecd88d6f6b2467acf2c0e62c9ed2c49b628ad5669"
 	;;
 esac
 
@@ -33,15 +33,19 @@ distfiles="http://download.oracle.com/otn-pub/java/jdk/${version}-b${_build}/${_
 wrksrc="jre$_longVersion"
 
 do_fetch() {
-	local path="${XBPS_SRCDISTDIR}/${pkgname}-${version}/$_filename"
-	mkdir -p "${XBPS_SRCDISTDIR}/${pkgname}-${version}" "${XBPS_BUILDDIR}/${pkgname}-${version}"
+	mkdir -p $wrksrc
+	cd $wrksrc
 	wget \
+		--no-check-certificate \
 		--header "Cookie: oraclelicense=accept-securebackup-cookie" \
 		--progress=bar:force \
-		-c -O $path \
+		-c -O $_filename \
 		$distfiles
-	mkdir -p $wrksrc
-	echo "$checksum  $path" | sha256sum -c 
+	echo "$checksum  $_filename" | sha256sum -c || { sha256sum "$_filename"; return 1; }
+}
+
+do_extract() {
+	tar xf $_filename -C ..
 }
 
 do_build() {