diff --git a/srcpkgs/oracle-jdk/INSTALL b/srcpkgs/oracle-jdk/INSTALL
index 9bdf2fa34a1..fae1134d9b8 100644
--- a/srcpkgs/oracle-jdk/INSTALL
+++ b/srcpkgs/oracle-jdk/INSTALL
@@ -4,7 +4,7 @@
 # properly.
 #
 
-BUILD_DIR="./var/tmp/${PKGNAME}.build"
+BUILD_DIR="./var/tmp/${PKGNAME}-${VERSION}.build"
 
 do_install() {
 	mkdir -p "$BUILD_DIR"
diff --git a/srcpkgs/oracle-jdk/REMOVE b/srcpkgs/oracle-jdk/REMOVE
index 64e30ce9e85..c9e64cd87ad 100644
--- a/srcpkgs/oracle-jdk/REMOVE
+++ b/srcpkgs/oracle-jdk/REMOVE
@@ -1,6 +1,7 @@
 case "$ACTION" in
 pre)
 	. usr/lib/jvm/oracle-jdk-vars.sh
+	rm -rf usr/lib/jvm/jdk$ORACLE_JDK_LONG_VERSION
 	rm -r usr/lib/jvm/$PKGNAME
 	;;
 esac
diff --git a/srcpkgs/oracle-jdk/template b/srcpkgs/oracle-jdk/template
index a079597f91c..8d47ffd7147 100644
--- a/srcpkgs/oracle-jdk/template
+++ b/srcpkgs/oracle-jdk/template
@@ -1,8 +1,9 @@
 # Template file for 'oracle-jdk'
 pkgname=oracle-jdk
 version=8u66
+revision=3
+
 _longVersion=1.8.0_66
-revision=2
 _build=17
 
 short_desc="Java Development Kit (JDK)"
diff --git a/srcpkgs/oracle-jre/INSTALL b/srcpkgs/oracle-jre/INSTALL
index 221b7cb4866..cc6be19ddf2 100644
--- a/srcpkgs/oracle-jre/INSTALL
+++ b/srcpkgs/oracle-jre/INSTALL
@@ -4,7 +4,7 @@
 # properly.
 #
 
-BUILD_DIR="./var/tmp/${PKGNAME}.build"
+BUILD_DIR="./var/tmp/${PKGNAME}-${VERSION}.build"
 
 do_install() {
 	mkdir -p "$BUILD_DIR"
diff --git a/srcpkgs/oracle-jre/REMOVE b/srcpkgs/oracle-jre/REMOVE
index 81227ddb6cb..cd3c8b2c398 100644
--- a/srcpkgs/oracle-jre/REMOVE
+++ b/srcpkgs/oracle-jre/REMOVE
@@ -2,5 +2,6 @@ case "$ACTION" in
 pre)
 	. usr/lib/jvm/oracle-jre-vars.sh
 	rm -r usr/lib/jvm/jre$ORACLE_JRE_LONG_VERSION
+	rm -r usr/lib/jvm/$PKGNAME
 	;;
 esac
diff --git a/srcpkgs/oracle-jre/template b/srcpkgs/oracle-jre/template
index 97da69e6ff4..43c920abdee 100644
--- a/srcpkgs/oracle-jre/template
+++ b/srcpkgs/oracle-jre/template
@@ -1,8 +1,9 @@
 # Template file for 'oracle-jre'
 pkgname=oracle-jre
 version=8u66
+revision=3
+
 _longVersion=1.8.0_66
-revision=2
 _build=17
 
 short_desc="Java Runtime Environment (JRE)"