diff --git a/srcpkgs/oracle-jdk-arm/template b/srcpkgs/oracle-jdk-arm/template
index 368ad7a9a4..7b0cdf4b20 100644
--- a/srcpkgs/oracle-jdk-arm/template
+++ b/srcpkgs/oracle-jdk-arm/template
@@ -2,7 +2,7 @@
 pkgname=oracle-jdk-arm
 version=8u51
 _longVersion=1.8.0_51
-revision=2
+revision=3
 _build=16
 
 short_desc="Java Development Kit (JDK)"
@@ -22,58 +22,58 @@ _filename=jdk-${version}-linux-arm-vfp-hflt.tar.gz
 checksum="2a6644a4540c8f47784daf8afcbb405a03e686720e4c9eac6584253a55def0c7"
 
 alternatives="
- java:/usr/bin/java:/usr/lib/jvm/oracle-jdk/bin/java
- java:/usr/bin/javaws:/usr/lib/jvm/oracle-jdk/bin/javaws
- java:/usr/bin/jcontrol:/usr/lib/jvm/oracle-jdk/bin/jcontrol
- java:/usr/bin/jjs:/usr/lib/jvm/oracle-jdk/bin/jjs
- java:/usr/bin/keytool:/usr/lib/jvm/oracle-jdk/bin/keytool
- java:/usr/bin/orbd:/usr/lib/jvm/oracle-jdk/bin/orbd
- java:/usr/bin/pack200:/usr/lib/jvm/oracle-jdk/bin/pack200
- java:/usr/bin/policytool:/usr/lib/jvm/oracle-jdk/bin/policytool
- java:/usr/bin/rmid:/usr/lib/jvm/oracle-jdk/bin/rmid
- java:/usr/bin/rmiregistry:/usr/lib/jvm/oracle-jdk/bin/rmiregistry
- java:/usr/bin/servertool:/usr/lib/jvm/oracle-jdk/bin/servertool
- java:/usr/bin/tnameserv:/usr/lib/jvm/oracle-jdk/bin/tnameserv
- java:/usr/bin/unpack200:/usr/lib/jvm/oracle-jdk/bin/unpack200
+ java:/usr/bin/java:/usr/lib/jvm/jdk${_longVersion}/bin/java
+ java:/usr/bin/javaws:/usr/lib/jvm/jdk${_longVersion}/bin/javaws
+ java:/usr/bin/jcontrol:/usr/lib/jvm/jdk${_longVersion}/bin/jcontrol
+ java:/usr/bin/jjs:/usr/lib/jvm/jdk${_longVersion}/bin/jjs
+ java:/usr/bin/keytool:/usr/lib/jvm/jdk${_longVersion}/bin/keytool
+ java:/usr/bin/orbd:/usr/lib/jvm/jdk${_longVersion}/bin/orbd
+ java:/usr/bin/pack200:/usr/lib/jvm/jdk${_longVersion}/bin/pack200
+ java:/usr/bin/policytool:/usr/lib/jvm/jdk${_longVersion}/bin/policytool
+ java:/usr/bin/rmid:/usr/lib/jvm/jdk${_longVersion}/bin/rmid
+ java:/usr/bin/rmiregistry:/usr/lib/jvm/jdk${_longVersion}/bin/rmiregistry
+ java:/usr/bin/servertool:/usr/lib/jvm/jdk${_longVersion}/bin/servertool
+ java:/usr/bin/tnameserv:/usr/lib/jvm/jdk${_longVersion}/bin/tnameserv
+ java:/usr/bin/unpack200:/usr/lib/jvm/jdk${_longVersion}/bin/unpack200
 
- jdk:/usr/bin/ControlPanel:/usr/lib/jvm/oracle-jdk/bin/ControlPanel
- jdk:/usr/bin/appletviewer:/usr/lib/jvm/oracle-jdk/bin/appletviewer
- jdk:/usr/bin/extcheck:/usr/lib/jvm/oracle-jdk/bin/extcheck
- jdk:/usr/bin/idlj:/usr/lib/jvm/oracle-jdk/bin/idlj
- jdk:/usr/bin/jar:/usr/lib/jvm/oracle-jdk/bin/jar
- jdk:/usr/bin/jarsigner:/usr/lib/jvm/oracle-jdk/bin/jarsigner
- jdk:/usr/bin/java-rmi.cgi:/usr/lib/jvm/oracle-jdk/bin/java-rmi.cgi
- jdk:/usr/bin/javac:/usr/lib/jvm/oracle-jdk/bin/javac
- jdk:/usr/bin/javadoc:/usr/lib/jvm/oracle-jdk/bin/javadoc
- jdk:/usr/bin/javafxpackager:/usr/lib/jvm/oracle-jdk/bin/javafxpackager
- jdk:/usr/bin/javah:/usr/lib/jvm/oracle-jdk/bin/javah
- jdk:/usr/bin/javap:/usr/lib/jvm/oracle-jdk/bin/javap
- jdk:/usr/bin/javapackager:/usr/lib/jvm/oracle-jdk/bin/javapackager
- jdk:/usr/bin/jcmd:/usr/lib/jvm/oracle-jdk/bin/jcmd
- jdk:/usr/bin/jconsole:/usr/lib/jvm/oracle-jdk/bin/jconsole
- jdk:/usr/bin/jdb:/usr/lib/jvm/oracle-jdk/bin/jdb
- jdk:/usr/bin/jdeps:/usr/lib/jvm/oracle-jdk/bin/jdeps
- jdk:/usr/bin/jhat:/usr/lib/jvm/oracle-jdk/bin/jhat
- jdk:/usr/bin/jinfo:/usr/lib/jvm/oracle-jdk/bin/jinfo
- jdk:/usr/bin/jmap:/usr/lib/jvm/oracle-jdk/bin/jmap
- jdk:/usr/bin/jmc:/usr/lib/jvm/oracle-jdk/bin/jmc
- jdk:/usr/bin/jmc.ini:/usr/lib/jvm/oracle-jdk/bin/jmc.ini
- jdk:/usr/bin/jps:/usr/lib/jvm/oracle-jdk/bin/jps
- jdk:/usr/bin/jrunscript:/usr/lib/jvm/oracle-jdk/bin/jrunscript
- jdk:/usr/bin/jsadebugd:/usr/lib/jvm/oracle-jdk/bin/jsadebugd
- jdk:/usr/bin/jstack:/usr/lib/jvm/oracle-jdk/bin/jstack
- jdk:/usr/bin/jstat:/usr/lib/jvm/oracle-jdk/bin/jstat
- jdk:/usr/bin/jstatd:/usr/lib/jvm/oracle-jdk/bin/jstatd
- jdk:/usr/bin/jvisualvm:/usr/lib/jvm/oracle-jdk/bin/jvisualvm
- jdk:/usr/bin/native2ascii:/usr/lib/jvm/oracle-jdk/bin/native2ascii
- jdk:/usr/bin/rmic:/usr/lib/jvm/oracle-jdk/bin/rmic
- jdk:/usr/bin/schemagen:/usr/lib/jvm/oracle-jdk/bin/schemagen
- jdk:/usr/bin/serialver:/usr/lib/jvm/oracle-jdk/bin/serialver
- jdk:/usr/bin/wsgen:/usr/lib/jvm/oracle-jdk/bin/wsgen
- jdk:/usr/bin/wsimport:/usr/lib/jvm/oracle-jdk/bin/wsimport
- jdk:/usr/bin/xjc:/usr/lib/jvm/oracle-jdk/bin/xjc
+ jdk:/usr/bin/ControlPanel:/usr/lib/jvm/jdk${_longVersion}/bin/ControlPanel
+ jdk:/usr/bin/appletviewer:/usr/lib/jvm/jdk${_longVersion}/bin/appletviewer
+ jdk:/usr/bin/extcheck:/usr/lib/jvm/jdk${_longVersion}/bin/extcheck
+ jdk:/usr/bin/idlj:/usr/lib/jvm/jdk${_longVersion}/bin/idlj
+ jdk:/usr/bin/jar:/usr/lib/jvm/jdk${_longVersion}/bin/jar
+ jdk:/usr/bin/jarsigner:/usr/lib/jvm/jdk${_longVersion}/bin/jarsigner
+ jdk:/usr/bin/java-rmi.cgi:/usr/lib/jvm/jdk${_longVersion}/bin/java-rmi.cgi
+ jdk:/usr/bin/javac:/usr/lib/jvm/jdk${_longVersion}/bin/javac
+ jdk:/usr/bin/javadoc:/usr/lib/jvm/jdk${_longVersion}/bin/javadoc
+ jdk:/usr/bin/javafxpackager:/usr/lib/jvm/jdk${_longVersion}/bin/javafxpackager
+ jdk:/usr/bin/javah:/usr/lib/jvm/jdk${_longVersion}/bin/javah
+ jdk:/usr/bin/javap:/usr/lib/jvm/jdk${_longVersion}/bin/javap
+ jdk:/usr/bin/javapackager:/usr/lib/jvm/jdk${_longVersion}/bin/javapackager
+ jdk:/usr/bin/jcmd:/usr/lib/jvm/jdk${_longVersion}/bin/jcmd
+ jdk:/usr/bin/jconsole:/usr/lib/jvm/jdk${_longVersion}/bin/jconsole
+ jdk:/usr/bin/jdb:/usr/lib/jvm/jdk${_longVersion}/bin/jdb
+ jdk:/usr/bin/jdeps:/usr/lib/jvm/jdk${_longVersion}/bin/jdeps
+ jdk:/usr/bin/jhat:/usr/lib/jvm/jdk${_longVersion}/bin/jhat
+ jdk:/usr/bin/jinfo:/usr/lib/jvm/jdk${_longVersion}/bin/jinfo
+ jdk:/usr/bin/jmap:/usr/lib/jvm/jdk${_longVersion}/bin/jmap
+ jdk:/usr/bin/jmc:/usr/lib/jvm/jdk${_longVersion}/bin/jmc
+ jdk:/usr/bin/jmc.ini:/usr/lib/jvm/jdk${_longVersion}/bin/jmc.ini
+ jdk:/usr/bin/jps:/usr/lib/jvm/jdk${_longVersion}/bin/jps
+ jdk:/usr/bin/jrunscript:/usr/lib/jvm/jdk${_longVersion}/bin/jrunscript
+ jdk:/usr/bin/jsadebugd:/usr/lib/jvm/jdk${_longVersion}/bin/jsadebugd
+ jdk:/usr/bin/jstack:/usr/lib/jvm/jdk${_longVersion}/bin/jstack
+ jdk:/usr/bin/jstat:/usr/lib/jvm/jdk${_longVersion}/bin/jstat
+ jdk:/usr/bin/jstatd:/usr/lib/jvm/jdk${_longVersion}/bin/jstatd
+ jdk:/usr/bin/jvisualvm:/usr/lib/jvm/jdk${_longVersion}/bin/jvisualvm
+ jdk:/usr/bin/native2ascii:/usr/lib/jvm/jdk${_longVersion}/bin/native2ascii
+ jdk:/usr/bin/rmic:/usr/lib/jvm/jdk${_longVersion}/bin/rmic
+ jdk:/usr/bin/schemagen:/usr/lib/jvm/jdk${_longVersion}/bin/schemagen
+ jdk:/usr/bin/serialver:/usr/lib/jvm/jdk${_longVersion}/bin/serialver
+ jdk:/usr/bin/wsgen:/usr/lib/jvm/jdk${_longVersion}/bin/wsgen
+ jdk:/usr/bin/wsimport:/usr/lib/jvm/jdk${_longVersion}/bin/wsimport
+ jdk:/usr/bin/xjc:/usr/lib/jvm/jdk${_longVersion}/bin/xjc
 
- java-plugin:/usr/lib/mozilla/plugins/libnpjp2.so:/usr/lib/jvm/oracle-jdk/jre/lib/$_arch/libnpjp2.so
+ java-plugin:/usr/lib/mozilla/plugins/libnpjp2.so:/usr/lib/jvm/jdk${_longVersion}/jre/lib/$_arch/libnpjp2.so
 "
 
 distfiles="http://download.oracle.com/otn-pub/java/jdk/${version}-b${_build}/${_filename}"