diff --git a/files/bin-wrapper.sh.in b/files/bin-wrapper.sh.in
new file mode 100644
--- /dev/null
+++ b/files/bin-wrapper.sh.in
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+if [ ! -e "$JAVA_HOME/bin/%%COMMAND%%" -a ! -z "$JAVA_HOME" ]; then
+  echo "error: JAVA_HOME is set but does not provide '%%COMMAND%%'" 1>&2
+  exit 1
+fi
+
+for FILE in "$JAVA_HOME/bin/%%COMMAND%%" "/usr/lib64/openjdk-8/bin/%%COMMAND%%" /usr/lib64/openjdk-*/bin/%%COMMAND%%; do
+  if [ -e "$FILE" ]; then
+    exec "$FILE" "$@"
+  fi
+done
+
+echo "error: no java version providing '%%COMMAND%%'" 1>&2
+exit 1
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,6 +1,6 @@
 name       : openjdk-8
 version    : 8.192
-release    : 15
+release    : 16
 source     :
     - https://getsol.us/sources/java/jdk8u192-b26.tar.bz2 : a8044863dad4d09a781a050a150868e7a2cc668da14069f80baed4b6bf88c839
     - https://getsol.us/sources/java/corba-u192-b26.tar.bz2 : cf75e3fda1e79a440605eb14b01aa13a6362a33adc6d2dace0eb19e4f71f2c02
@@ -15,6 +15,10 @@
 summary    : Open implementation of Oracle's Java Development Kit
 description: |
     Open implementation of Oracle's Java Development Kit
+patterns   :
+    - ^openjdk-bin: ['/usr/bin/*']
+rundeps    :
+    - openjdk-bin
 builddeps  :
     - cups-devel
     - giflib-devel
@@ -65,7 +69,9 @@
     rmdir $installdir/usr/jvm
     pushd $installdir/usr/bin
     for i in $installdir/%libdir%/openjdk-8/bin/*; do
-      ln -sf %libdir%/openjdk-8/bin/`basename $i` .
+      TEMP_FILE=$(mktemp)
+      sed -e "s/%%COMMAND%%/`basename $i`/g" $pkgfiles/bin-wrapper.sh.in > $TEMP_FILE
+      install -m 00755 -D $TEMP_FILE `basename $i`
     done
     popd
 
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
     <Source>
         <Name>openjdk-8</Name>
         <Packager>
-            <Name>Philipp Trulson</Name>
-            <Email>philipp@trulson.de</Email>
+            <Name>Jan Jedelský</Name>
+            <Email>hjajet@gmail.com</Email>
         </Packager>
         <License>GPL-2.0-with-classpath-exception</License>
         <PartOf>programming.java</PartOf>
@@ -18,48 +18,10 @@
         <Description xml:lang="en">Open implementation of Oracle&apos;s Java Development Kit
 </Description>
         <PartOf>programming.java</PartOf>
+        <RuntimeDependencies>
+            <Dependency releaseFrom="16">openjdk-bin</Dependency>
+        </RuntimeDependencies>
         <Files>
-            <Path fileType="executable">/usr/bin/appletviewer</Path>
-            <Path fileType="executable">/usr/bin/extcheck</Path>
-            <Path fileType="executable">/usr/bin/idlj</Path>
-            <Path fileType="executable">/usr/bin/jar</Path>
-            <Path fileType="executable">/usr/bin/jarsigner</Path>
-            <Path fileType="executable">/usr/bin/java</Path>
-            <Path fileType="executable">/usr/bin/java-rmi.cgi</Path>
-            <Path fileType="executable">/usr/bin/javac</Path>
-            <Path fileType="executable">/usr/bin/javadoc</Path>
-            <Path fileType="executable">/usr/bin/javah</Path>
-            <Path fileType="executable">/usr/bin/javap</Path>
-            <Path fileType="executable">/usr/bin/jcmd</Path>
-            <Path fileType="executable">/usr/bin/jconsole</Path>
-            <Path fileType="executable">/usr/bin/jdb</Path>
-            <Path fileType="executable">/usr/bin/jdeps</Path>
-            <Path fileType="executable">/usr/bin/jhat</Path>
-            <Path fileType="executable">/usr/bin/jinfo</Path>
-            <Path fileType="executable">/usr/bin/jjs</Path>
-            <Path fileType="executable">/usr/bin/jmap</Path>
-            <Path fileType="executable">/usr/bin/jps</Path>
-            <Path fileType="executable">/usr/bin/jrunscript</Path>
-            <Path fileType="executable">/usr/bin/jsadebugd</Path>
-            <Path fileType="executable">/usr/bin/jstack</Path>
-            <Path fileType="executable">/usr/bin/jstat</Path>
-            <Path fileType="executable">/usr/bin/jstatd</Path>
-            <Path fileType="executable">/usr/bin/keytool</Path>
-            <Path fileType="executable">/usr/bin/native2ascii</Path>
-            <Path fileType="executable">/usr/bin/orbd</Path>
-            <Path fileType="executable">/usr/bin/pack200</Path>
-            <Path fileType="executable">/usr/bin/policytool</Path>
-            <Path fileType="executable">/usr/bin/rmic</Path>
-            <Path fileType="executable">/usr/bin/rmid</Path>
-            <Path fileType="executable">/usr/bin/rmiregistry</Path>
-            <Path fileType="executable">/usr/bin/schemagen</Path>
-            <Path fileType="executable">/usr/bin/serialver</Path>
-            <Path fileType="executable">/usr/bin/servertool</Path>
-            <Path fileType="executable">/usr/bin/tnameserv</Path>
-            <Path fileType="executable">/usr/bin/unpack200</Path>
-            <Path fileType="executable">/usr/bin/wsgen</Path>
-            <Path fileType="executable">/usr/bin/wsimport</Path>
-            <Path fileType="executable">/usr/bin/xjc</Path>
             <Path fileType="library">/usr/lib64/openjdk-8/ASSEMBLY_EXCEPTION</Path>
             <Path fileType="library">/usr/lib64/openjdk-8/LICENSE</Path>
             <Path fileType="library">/usr/lib64/openjdk-8/THIRD_PARTY_README</Path>
@@ -806,6 +768,55 @@
             <Path fileType="man">/usr/share/man/man1/xjc.1</Path>
         </Files>
     </Package>
+    <Package>
+        <Name>openjdk-bin</Name>
+        <Summary xml:lang="en">Open implementation of Oracle&apos;s Java Development Kit</Summary>
+        <Description xml:lang="en">Open implementation of Oracle&apos;s Java Development Kit
+</Description>
+        <Files>
+            <Path fileType="executable">/usr/bin/appletviewer</Path>
+            <Path fileType="executable">/usr/bin/extcheck</Path>
+            <Path fileType="executable">/usr/bin/idlj</Path>
+            <Path fileType="executable">/usr/bin/jar</Path>
+            <Path fileType="executable">/usr/bin/jarsigner</Path>
+            <Path fileType="executable">/usr/bin/java</Path>
+            <Path fileType="executable">/usr/bin/java-rmi.cgi</Path>
+            <Path fileType="executable">/usr/bin/javac</Path>
+            <Path fileType="executable">/usr/bin/javadoc</Path>
+            <Path fileType="executable">/usr/bin/javah</Path>
+            <Path fileType="executable">/usr/bin/javap</Path>
+            <Path fileType="executable">/usr/bin/jcmd</Path>
+            <Path fileType="executable">/usr/bin/jconsole</Path>
+            <Path fileType="executable">/usr/bin/jdb</Path>
+            <Path fileType="executable">/usr/bin/jdeps</Path>
+            <Path fileType="executable">/usr/bin/jhat</Path>
+            <Path fileType="executable">/usr/bin/jinfo</Path>
+            <Path fileType="executable">/usr/bin/jjs</Path>
+            <Path fileType="executable">/usr/bin/jmap</Path>
+            <Path fileType="executable">/usr/bin/jps</Path>
+            <Path fileType="executable">/usr/bin/jrunscript</Path>
+            <Path fileType="executable">/usr/bin/jsadebugd</Path>
+            <Path fileType="executable">/usr/bin/jstack</Path>
+            <Path fileType="executable">/usr/bin/jstat</Path>
+            <Path fileType="executable">/usr/bin/jstatd</Path>
+            <Path fileType="executable">/usr/bin/keytool</Path>
+            <Path fileType="executable">/usr/bin/native2ascii</Path>
+            <Path fileType="executable">/usr/bin/orbd</Path>
+            <Path fileType="executable">/usr/bin/pack200</Path>
+            <Path fileType="executable">/usr/bin/policytool</Path>
+            <Path fileType="executable">/usr/bin/rmic</Path>
+            <Path fileType="executable">/usr/bin/rmid</Path>
+            <Path fileType="executable">/usr/bin/rmiregistry</Path>
+            <Path fileType="executable">/usr/bin/schemagen</Path>
+            <Path fileType="executable">/usr/bin/serialver</Path>
+            <Path fileType="executable">/usr/bin/servertool</Path>
+            <Path fileType="executable">/usr/bin/tnameserv</Path>
+            <Path fileType="executable">/usr/bin/unpack200</Path>
+            <Path fileType="executable">/usr/bin/wsgen</Path>
+            <Path fileType="executable">/usr/bin/wsimport</Path>
+            <Path fileType="executable">/usr/bin/xjc</Path>
+        </Files>
+    </Package>
     <Package>
         <Name>openjdk-8-devel</Name>
         <Summary xml:lang="en">Development files for openjdk-8</Summary>
@@ -813,7 +824,7 @@
 </Description>
         <PartOf>programming.devel</PartOf>
         <RuntimeDependencies>
-            <Dependency release="15">openjdk-8</Dependency>
+            <Dependency release="16">openjdk-8</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include/openjdk-8/classfile_constants.h</Path>
@@ -827,12 +838,12 @@
         </Files>
     </Package>
     <History>
-        <Update release="15">
-            <Date>2018-10-23</Date>
+        <Update release="16">
+            <Date>2018-12-15</Date>
             <Version>8.192</Version>
             <Comment>Packaging update</Comment>
-            <Name>Philipp Trulson</Name>
-            <Email>philipp@trulson.de</Email>
+            <Name>Jan Jedelský</Name>
+            <Email>hjajet@gmail.com</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file