diff --git a/abi_used_libs b/abi_used_libs
--- a/abi_used_libs
+++ b/abi_used_libs
@@ -1,4 +1,5 @@
 ld-linux-x86-64.so.2
+libGL.so.1
 libX11.so.6
 libXext.so.6
 libXi.so.6
@@ -6,13 +7,25 @@
 libXtst.so.6
 libasound.so.2
 libc.so.6
+libcairo.so.2
 libdl.so.2
 libfreetype.so.6
 libgcc_s.so.1
+libgdk-3.so.0
+libgdk-x11-2.0.so.0
+libgdk_pixbuf-2.0.so.0
 libgif.so.7
+libgio-2.0.so.0
+libglib-2.0.so.0
+libgobject-2.0.so.0
+libgthread-2.0.so.0
+libgtk-3.so.0
+libgtk-x11-2.0.so.0
 libjpeg.so.8
 liblcms2.so.2
 libm.so.6
+libpango-1.0.so.0
+libpangoft2-1.0.so.0
 libpng16.so.16
 libpthread.so.0
 libstdc++.so.6
diff --git a/files/disable-warnings-as-errors.patch b/files/disable-warnings-as-errors.patch
new file mode 100644
--- /dev/null
+++ b/files/disable-warnings-as-errors.patch
@@ -0,0 +1,31 @@
+diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle
+index 7a7cbc72..6955155e 100644
+--- a/buildSrc/linux.gradle
++++ b/buildSrc/linux.gradle
+@@ -223,7 +223,7 @@ FileTree ft_gtk = fileTree("${project(":graphics").projectDir}/src/main/native-g
+ LINUX.glass.glass = [:]
+ LINUX.glass.glass.nativeSource = ft_gtk_launcher.getFiles()
+ LINUX.glass.glass.compiler = compiler
+-LINUX.glass.glass.ccFlags = [ccFlags, gtk2CCFlags,  "-Werror"].flatten()
++LINUX.glass.glass.ccFlags = [ccFlags, gtk2CCFlags].flatten()
+ LINUX.glass.glass.linker = linker
+ LINUX.glass.glass.linkFlags = [linkFlags, "-lX11", "-ldl" ].flatten()
+ LINUX.glass.glass.lib = "glass"
+@@ -231,7 +231,7 @@ LINUX.glass.glass.lib = "glass"
+ LINUX.glass.glassgtk2 = [:]
+ LINUX.glass.glassgtk2.nativeSource =  ft_gtk.getFiles()
+ LINUX.glass.glassgtk2.compiler = compiler
+-LINUX.glass.glassgtk2.ccFlags = [ccFlags, gtk2CCFlags, "-Werror"].flatten()
++LINUX.glass.glassgtk2.ccFlags = [ccFlags, gtk2CCFlags].flatten()
+ LINUX.glass.glassgtk2.linker = linker
+ LINUX.glass.glassgtk2.linkFlags = [linkFlags, gtk2LinkFlags ].flatten()
+ LINUX.glass.glassgtk2.lib = "glassgtk2"
+@@ -239,7 +239,7 @@ LINUX.glass.glassgtk2.lib = "glassgtk2"
+ LINUX.glass.glassgtk3 = [:]
+ LINUX.glass.glassgtk3.nativeSource =  ft_gtk.getFiles()
+ LINUX.glass.glassgtk3.compiler = compiler
+-LINUX.glass.glassgtk3.ccFlags = [ccFlags, gtk3CCFlags, "-Werror"].flatten()
++LINUX.glass.glassgtk3.ccFlags = [ccFlags, gtk3CCFlags].flatten()
+ LINUX.glass.glassgtk3.linker = linker
+ LINUX.glass.glassgtk3.linkFlags = [linkFlags, gtk3LinkFlags ].flatten()
+ LINUX.glass.glassgtk3.lib = "glassgtk3"
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,18 +1,21 @@
 name       : openjdk-11
 version    : 11.0.8
-release    : 1
+release    : 2
 source     :
-    - http://hg.openjdk.java.net/jdk-updates/jdk11u/archive/jdk-11.0.8+5.tar.bz2 : 56fe2712180b6efe81bb0b9b1bbaf8abb27fc9b03213fefb91194e51a44b559f
-    - https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_linux-x64_bin.tar.gz : 99be79935354f5c0df1ad293620ea36d13f48ec3ea870c838f20c504c9668b57
+    - https://hg.openjdk.java.net/jdk-updates/jdk11u/archive/jdk-11.0.8+5.tar.bz2 : 56fe2712180b6efe81bb0b9b1bbaf8abb27fc9b03213fefb91194e51a44b559f
+    - https://hg.openjdk.java.net/openjfx/11-dev/rt/archive/11.0.8+1.tar.bz2 : c7135b2be088515665b72d5597e57d29c51799c9a401ca51574c8802ed21b827
 license    : GPL-2.0-with-classpath-exception
 component  : programming.java
-summary    : Open implementation of Oracle's Java Development Kit
+summary    : Open implementation of Oracle's Java Development Kit version 11
 description: |
-    Open implementation of Oracle's Java Development Kit
+    Open implementation of Oracle's Java Development Kit version 11, with OpenJFX 11 included
 ccache     : no
+networking : yes
 builddeps  :
     - pkgconfig(alsa)
     - pkgconfig(fontconfig)
+    - pkgconfig(gtk+-2.0)
+    - pkgconfig(gtk+-3.0)
     - pkgconfig(lcms2)
     - pkgconfig(libjpeg)
     - pkgconfig(x11)
@@ -21,15 +24,27 @@
     - pkgconfig(xrender)
     - pkgconfig(xt)
     - pkgconfig(xtst)
+    - pkgconfig(xxf86vm)
+    - apache-ant
     - cups-devel
     - giflib-devel
+    - openjdk-11-devel
     - p7zip
 setup      : |
-    # Unpack prebuilt tarball for bootstrap
-    tar xvzf $sources/openjdk-11.0.2_linux-x64_bin.tar.gz -C $workdir
+    # Unpack openjfx for integration
+    mkdir openjfx-11
+    tar xjf $sources/11.*.tar.bz2 -C $workdir/openjfx-11 --strip-components=1
+
+    # Build OpenJFX
+    pushd openjfx-11
+    %patch -p1 < $pkgfiles/disable-warnings-as-errors.patch
+    chmod +x gradlew
+    export CFLAGS="-Wno-error"
+    JAVA_HOME=/usr/lib64/openjdk-11 GRADLE_USER_HOME=$workdir/.gradle TERM=dumb ./gradlew zips --no-daemon
+    popd
 
     bash ./configure --prefix="$installdir/usr" \
-        --with-boot-jdk=$workdir/jdk-11.0.2 \
+        --with-boot-jdk="/usr/lib64/openjdk-11" \
         --with-version-build=10 \
         --with-version-pre="" \
         --with-version-opt="" \
@@ -41,23 +56,35 @@
         --with-zlib=system \
         --enable-unlimited-crypto \
         --disable-warnings-as-errors \
+        --with-import-modules=$workdir/openjfx-11/build/modular-sdk \
+        --with-cacerts-file=%libdir%/openjdk-11/lib/security/cacerts \
         --with-jobs=%YJOBS% \
         --with-extra-ldflags="$LDFLAGS"
 build      : |
-    make images
+    make images legacy-jre-image
 install    : |
-    install -Ddm 00755 $installdir/%libdir% $installdir/usr/include/openjdk-11 $installdir/usr/share/man/man1
+    install -Ddm 00755 $installdir/%libdir%/ 
+    mkdir -p $installdir/usr/include/openjdk-11/ $installdir/usr/share/applications/
+
     make install
 
     # Binaries
-    mv $installdir/usr/jvm/openjdk-%version% $installdir/%libdir%/openjdk-11
-    rm -rf $installdir/usr/jvm
-    rm -rf $installdir/usr/bin
+    mv $installdir/usr/jvm/openjdk-%version% $installdir/%libdir%/openjdk-11/
+    rm -rf $installdir/usr/jvm/
+    rm -rf $installdir/usr/bin/
+
+    # Headers
+    cd build/linux-x86_64-normal-server-release/
+    cp -ar jdk/include/* $installdir/usr/include/openjdk-11/
+    # Symlink header files (because some apps look for them in $JAVA_HOME)
+    ln -s /usr/include/openjdk-11/ $installdir/usr/lib64/openjdk-11/include/
 
-    # Headers and man pages
-    cd build/linux-x86_64-normal-server-release
-    cp -ar jdk/include/* $installdir/usr/include/openjdk-11/.
-    mv $installdir/usr/lib64/openjdk-11/man/man1/*.1 $installdir/usr/share/man/man1/
+    # Man pages
+    mv $installdir/usr/lib64/openjdk-11/man/ $installdir/usr/share/
+    find $installdir/usr/share/man/ -type f -exec rename -- ".1" "-11.1" {} \;
+    # Remove pre-existing symlink first
+    rm $installdir/usr/share/man/ja
+    mv -f $installdir/usr/share/man/ja_JP.UTF-8/ $installdir/usr/share/man/ja/
 
     # Add java-11-jar.desktop into usable apps
-    install -Dm 00644 $pkgfiles/java-11-jar.desktop $installdir/usr/share/applications/java-11-jar.desktop
+    install -Dm 00644 $pkgfiles/java-11-jar.desktop $installdir/usr/share/applications/
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -7,15 +7,15 @@
         </Packager>
         <License>GPL-2.0-with-classpath-exception</License>
         <PartOf>programming.java</PartOf>
-        <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
+        <Summary xml:lang="en">Open implementation of Oracle&apos;s Java Development Kit version 11</Summary>
+        <Description xml:lang="en">Open implementation of Oracle&apos;s Java Development Kit version 11, with OpenJFX 11 included
 </Description>
         <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://getsol.us/sources/README.Solus</Archive>
     </Source>
     <Package>
         <Name>openjdk-11</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
+        <Summary xml:lang="en">Open implementation of Oracle&apos;s Java Development Kit version 11</Summary>
+        <Description xml:lang="en">Open implementation of Oracle&apos;s Java Development Kit version 11, with OpenJFX 11 included
 </Description>
         <PartOf>programming.java</PartOf>
         <Files>
@@ -225,6 +225,7 @@
             <Path fileType="library">/usr/lib64/openjdk-11/include/jvmticmlr.h</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/include/linux/jawt_md.h</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/include/linux/jni_md.h</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/include/openjdk-11</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/jmods/java.base.jmod</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/jmods/java.compiler.jmod</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/jmods/java.datatransfer.jmod</Path>
@@ -247,6 +248,13 @@
             <Path fileType="library">/usr/lib64/openjdk-11/jmods/java.transaction.xa.jmod</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/jmods/java.xml.crypto.jmod</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/jmods/java.xml.jmod</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/jmods/javafx.base.jmod</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/jmods/javafx.controls.jmod</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/jmods/javafx.fxml.jmod</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/jmods/javafx.graphics.jmod</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/jmods/javafx.media.jmod</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/jmods/javafx.swing.jmod</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/jmods/javafx.web.jmod</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/jmods/jdk.accessibility.jmod</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/jmods/jdk.aot.jmod</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/jmods/jdk.attach.jmod</Path>
@@ -379,6 +387,36 @@
             <Path fileType="library">/usr/lib64/openjdk-11/legal/java.xml/jcup.md</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/legal/java.xml/xalan.md</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/legal/java.xml/xerces.md</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/legal/javafx.base/ADDITIONAL_LICENSE_INFO</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/legal/javafx.base/ASSEMBLY_EXCEPTION</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/legal/javafx.base/LICENSE</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/legal/javafx.controls/ADDITIONAL_LICENSE_INFO</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/legal/javafx.controls/ASSEMBLY_EXCEPTION</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/legal/javafx.controls/LICENSE</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/legal/javafx.fxml/ADDITIONAL_LICENSE_INFO</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/legal/javafx.fxml/ASSEMBLY_EXCEPTION</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/legal/javafx.fxml/LICENSE</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/legal/javafx.graphics/ADDITIONAL_LICENSE_INFO</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/legal/javafx.graphics/ASSEMBLY_EXCEPTION</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/legal/javafx.graphics/LICENSE</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/legal/javafx.graphics/jpeg_fx.md</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/legal/javafx.graphics/mesa3d.md</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/legal/javafx.media/ADDITIONAL_LICENSE_INFO</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/legal/javafx.media/ASSEMBLY_EXCEPTION</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/legal/javafx.media/LICENSE</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/legal/javafx.media/glib.md</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/legal/javafx.media/gstreamer.md</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/legal/javafx.media/libffi.md</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/legal/javafx.swing/ADDITIONAL_LICENSE_INFO</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/legal/javafx.swing/ASSEMBLY_EXCEPTION</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/legal/javafx.swing/LICENSE</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/legal/javafx.web/ADDITIONAL_LICENSE_INFO</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/legal/javafx.web/ASSEMBLY_EXCEPTION</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/legal/javafx.web/LICENSE</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/legal/javafx.web/icu_web.md</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/legal/javafx.web/libxml2.md</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/legal/javafx.web/libxslt.md</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/legal/javafx.web/webkit.md</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/legal/jdk.accessibility/ADDITIONAL_LICENSE_INFO</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/legal/jdk.accessibility/ASSEMBLY_EXCEPTION</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/legal/jdk.accessibility/LICENSE</Path>
@@ -540,6 +578,8 @@
             <Path fileType="library">/usr/lib64/openjdk-11/legal/jdk.zipfs/LICENSE</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/lib/classlist</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/lib/ct.sym</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/lib/javafx-swt.jar</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/lib/javafx.properties</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/lib/jexec</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/lib/jexec.debuginfo</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/lib/jfr/default.jfc</Path>
@@ -558,12 +598,16 @@
             <Path fileType="library">/usr/lib64/openjdk-11/lib/libawt_headless.so</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/lib/libawt_xawt.debuginfo</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/lib/libawt_xawt.so</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/lib/libdecora_sse.so</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/lib/libdt_socket.debuginfo</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/lib/libdt_socket.so</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/lib/libextnet.debuginfo</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/lib/libextnet.so</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/lib/libfontmanager.debuginfo</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/lib/libfontmanager.so</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/lib/libglass.so</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/lib/libglassgtk2.so</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/lib/libglassgtk3.so</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/lib/libinstrument.debuginfo</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/lib/libinstrument.so</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/lib/libj2gss.debuginfo</Path>
@@ -576,6 +620,10 @@
             <Path fileType="library">/usr/lib64/openjdk-11/lib/libjaas.so</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/lib/libjava.debuginfo</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/lib/libjava.so</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/lib/libjavafx_font.so</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/lib/libjavafx_font_freetype.so</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/lib/libjavafx_font_pango.so</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/lib/libjavafx_iio.so</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/lib/libjavajpeg.debuginfo</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/lib/libjavajpeg.so</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/lib/libjawt.debuginfo</Path>
@@ -604,6 +652,9 @@
             <Path fileType="library">/usr/lib64/openjdk-11/lib/libnio.so</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/lib/libprefs.debuginfo</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/lib/libprefs.so</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/lib/libprism_common.so</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/lib/libprism_es2.so</Path>
+            <Path fileType="library">/usr/lib64/openjdk-11/lib/libprism_sw.so</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/lib/librmi.debuginfo</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/lib/librmi.so</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/lib/libsaproc.debuginfo</Path>
@@ -633,70 +684,68 @@
             <Path fileType="library">/usr/lib64/openjdk-11/lib/server/libjvm.so</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/lib/src.zip</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/lib/tzdb.dat</Path>
-            <Path fileType="library">/usr/lib64/openjdk-11/man/ja</Path>
-            <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/jar.1</Path>
-            <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/jarsigner.1</Path>
-            <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/java.1</Path>
-            <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/javac.1</Path>
-            <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/javadoc.1</Path>
-            <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/javap.1</Path>
-            <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/jcmd.1</Path>
-            <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/jconsole.1</Path>
-            <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/jdb.1</Path>
-            <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/jdeps.1</Path>
-            <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/jinfo.1</Path>
-            <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/jjs.1</Path>
-            <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/jmap.1</Path>
-            <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/jps.1</Path>
-            <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/jrunscript.1</Path>
-            <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/jstack.1</Path>
-            <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/jstat.1</Path>
-            <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/jstatd.1</Path>
-            <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/keytool.1</Path>
-            <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/pack200.1</Path>
-            <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/rmic.1</Path>
-            <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/rmid.1</Path>
-            <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/rmiregistry.1</Path>
-            <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/serialver.1</Path>
-            <Path fileType="library">/usr/lib64/openjdk-11/man/ja_JP.UTF-8/man1/unpack200.1</Path>
-            <Path fileType="library">/usr/lib64/openjdk-11/man/man1</Path>
             <Path fileType="library">/usr/lib64/openjdk-11/release</Path>
             <Path fileType="data">/usr/share/applications/java-11-jar.desktop</Path>
-            <Path fileType="man">/usr/share/man/man1/jar.1</Path>
-            <Path fileType="man">/usr/share/man/man1/jarsigner.1</Path>
-            <Path fileType="man">/usr/share/man/man1/java.1</Path>
-            <Path fileType="man">/usr/share/man/man1/javac.1</Path>
-            <Path fileType="man">/usr/share/man/man1/javadoc.1</Path>
-            <Path fileType="man">/usr/share/man/man1/javap.1</Path>
-            <Path fileType="man">/usr/share/man/man1/jcmd.1</Path>
-            <Path fileType="man">/usr/share/man/man1/jconsole.1</Path>
-            <Path fileType="man">/usr/share/man/man1/jdb.1</Path>
-            <Path fileType="man">/usr/share/man/man1/jdeps.1</Path>
-            <Path fileType="man">/usr/share/man/man1/jinfo.1</Path>
-            <Path fileType="man">/usr/share/man/man1/jjs.1</Path>
-            <Path fileType="man">/usr/share/man/man1/jmap.1</Path>
-            <Path fileType="man">/usr/share/man/man1/jps.1</Path>
-            <Path fileType="man">/usr/share/man/man1/jrunscript.1</Path>
-            <Path fileType="man">/usr/share/man/man1/jstack.1</Path>
-            <Path fileType="man">/usr/share/man/man1/jstat.1</Path>
-            <Path fileType="man">/usr/share/man/man1/jstatd.1</Path>
-            <Path fileType="man">/usr/share/man/man1/keytool.1</Path>
-            <Path fileType="man">/usr/share/man/man1/pack200.1</Path>
-            <Path fileType="man">/usr/share/man/man1/rmic.1</Path>
-            <Path fileType="man">/usr/share/man/man1/rmid.1</Path>
-            <Path fileType="man">/usr/share/man/man1/rmiregistry.1</Path>
-            <Path fileType="man">/usr/share/man/man1/serialver.1</Path>
-            <Path fileType="man">/usr/share/man/man1/unpack200.1</Path>
+            <Path fileType="man">/usr/share/man/ja/man1/jar-11.1</Path>
+            <Path fileType="man">/usr/share/man/ja/man1/jarsigner-11.1</Path>
+            <Path fileType="man">/usr/share/man/ja/man1/java-11.1</Path>
+            <Path fileType="man">/usr/share/man/ja/man1/javac-11.1</Path>
+            <Path fileType="man">/usr/share/man/ja/man1/javadoc-11.1</Path>
+            <Path fileType="man">/usr/share/man/ja/man1/javap-11.1</Path>
+            <Path fileType="man">/usr/share/man/ja/man1/jcmd-11.1</Path>
+            <Path fileType="man">/usr/share/man/ja/man1/jconsole-11.1</Path>
+            <Path fileType="man">/usr/share/man/ja/man1/jdb-11.1</Path>
+            <Path fileType="man">/usr/share/man/ja/man1/jdeps-11.1</Path>
+            <Path fileType="man">/usr/share/man/ja/man1/jinfo-11.1</Path>
+            <Path fileType="man">/usr/share/man/ja/man1/jjs-11.1</Path>
+            <Path fileType="man">/usr/share/man/ja/man1/jmap-11.1</Path>
+            <Path fileType="man">/usr/share/man/ja/man1/jps-11.1</Path>
+            <Path fileType="man">/usr/share/man/ja/man1/jrunscript-11.1</Path>
+            <Path fileType="man">/usr/share/man/ja/man1/jstack-11.1</Path>
+            <Path fileType="man">/usr/share/man/ja/man1/jstat-11.1</Path>
+            <Path fileType="man">/usr/share/man/ja/man1/jstatd-11.1</Path>
+            <Path fileType="man">/usr/share/man/ja/man1/keytool-11.1</Path>
+            <Path fileType="man">/usr/share/man/ja/man1/pack200-11.1</Path>
+            <Path fileType="man">/usr/share/man/ja/man1/rmic-11.1</Path>
+            <Path fileType="man">/usr/share/man/ja/man1/rmid-11.1</Path>
+            <Path fileType="man">/usr/share/man/ja/man1/rmiregistry-11.1</Path>
+            <Path fileType="man">/usr/share/man/ja/man1/serialver-11.1</Path>
+            <Path fileType="man">/usr/share/man/ja/man1/unpack200-11.1</Path>
+            <Path fileType="man">/usr/share/man/man1/jar-11.1</Path>
+            <Path fileType="man">/usr/share/man/man1/jarsigner-11.1</Path>
+            <Path fileType="man">/usr/share/man/man1/java-11.1</Path>
+            <Path fileType="man">/usr/share/man/man1/javac-11.1</Path>
+            <Path fileType="man">/usr/share/man/man1/javadoc-11.1</Path>
+            <Path fileType="man">/usr/share/man/man1/javap-11.1</Path>
+            <Path fileType="man">/usr/share/man/man1/jcmd-11.1</Path>
+            <Path fileType="man">/usr/share/man/man1/jconsole-11.1</Path>
+            <Path fileType="man">/usr/share/man/man1/jdb-11.1</Path>
+            <Path fileType="man">/usr/share/man/man1/jdeps-11.1</Path>
+            <Path fileType="man">/usr/share/man/man1/jinfo-11.1</Path>
+            <Path fileType="man">/usr/share/man/man1/jjs-11.1</Path>
+            <Path fileType="man">/usr/share/man/man1/jmap-11.1</Path>
+            <Path fileType="man">/usr/share/man/man1/jps-11.1</Path>
+            <Path fileType="man">/usr/share/man/man1/jrunscript-11.1</Path>
+            <Path fileType="man">/usr/share/man/man1/jstack-11.1</Path>
+            <Path fileType="man">/usr/share/man/man1/jstat-11.1</Path>
+            <Path fileType="man">/usr/share/man/man1/jstatd-11.1</Path>
+            <Path fileType="man">/usr/share/man/man1/keytool-11.1</Path>
+            <Path fileType="man">/usr/share/man/man1/pack200-11.1</Path>
+            <Path fileType="man">/usr/share/man/man1/rmic-11.1</Path>
+            <Path fileType="man">/usr/share/man/man1/rmid-11.1</Path>
+            <Path fileType="man">/usr/share/man/man1/rmiregistry-11.1</Path>
+            <Path fileType="man">/usr/share/man/man1/serialver-11.1</Path>
+            <Path fileType="man">/usr/share/man/man1/unpack200-11.1</Path>
         </Files>
     </Package>
     <Package>
         <Name>openjdk-11-devel</Name>
         <Summary xml:lang="en">Development files for openjdk-11</Summary>
-        <Description xml:lang="en">Open implementation of Oracle&apos;s Java Development Kit
+        <Description xml:lang="en">Open implementation of Oracle&apos;s Java Development Kit version 11, with OpenJFX 11 included
 </Description>
         <PartOf>programming.devel</PartOf>
         <RuntimeDependencies>
-            <Dependency release="1">openjdk-11</Dependency>
+            <Dependency release="2">openjdk-11</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include/openjdk-11/classfile_constants.h</Path>
@@ -709,8 +758,8 @@
         </Files>
     </Package>
     <History>
-        <Update release="1">
-            <Date>2020-05-30</Date>
+        <Update release="2">
+            <Date>2020-06-13</Date>
             <Version>11.0.8</Version>
             <Comment>Packaging update</Comment>
             <Name>Campbell Jones</Name>