diff --git a/build.gradle b/build.gradle
index 045362c3..8d46066f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,7 +24,7 @@ plugins {
     id 'java'
     id 'idea'
     id 'org.openjfx.javafxplugin' version '0.0.6'
-    id 'org.beryx.runtime' version '1.1.5'
+    id 'org.beryx.runtime' version '1.8.0'
 }
 
 repositories {
@@ -114,17 +114,21 @@ task buildSdr(type: Jar) {
  * within a JDK for each of the specified architectures.  These JDKs are used by the 
  * runtime and runtimeZip tasks to produce platform-specific builds
  */
-def jdkLinux_x64 = '/media/denny/WD250GB/java/bellsoft/linux-x64/jdk-11.0.2'
-def jdkOsx_x64 = '/media/denny/WD250GB/java/bellsoft/osx-x64/jdk-11.0.2.jdk'
-def jdkWindows_x64 = '/media/denny/WD250GB/java/bellsoft/windows-x64/jdk-11.0.2'
+def jdkLinux_x64 = '/media/denny/WD250GB/java/bellsoft/linux-x64/jdk-13.0.1'
+def jdkLinux_x86 = '/media/denny/WD250GB/java/bellsoft/linux-x86/jdk-13.0.1'
+def jdkOsx_x64 = '/media/denny/WD250GB/java/bellsoft/osx-x64/jdk-13.0.1.jdk'
+def jdkWindows_x64 = '/media/denny/WD250GB/java/bellsoft/windows-x64/jdk-13.0.1'
+def jdkWindows_x86 = '/media/denny/WD250GB/java/bellsoft/windows-x86/jdk-13.0.1'
 //def jdkLinux_aarch64 = '/media/denny/WD250GB/java/bellsoft/linux-aarch64/jdk-11.0.2'
 //def jdkLinux_arm32 = '/media/denny/WD250GB/java/bellsoft/linux-arm32/jdk-11.0.2'
 //def jfxLinux_arm32 = '/media/denny/WD250GB/java/bellsoft/linux-arm32/armv6hf-sdk/lib'
 
 runtime {
     targetPlatform('linux-x64', jdkLinux_x64)
+    targetPlatform('linux-x86', jdkLinux_x86)
     targetPlatform('osx-x64', jdkOsx_x64)
     targetPlatform('windows-x64', jdkWindows_x64)
+    targetPlatform('windows-x86', jdkWindows_x86)
 //    targetPlatform('linux-aarch64', jdkLinux_aarch64)
 //    targetPlatform('linux-arm32', jdkLinux_arm32)
 
@@ -146,6 +150,15 @@ tasks.runtime.doFirst {
                 "Please update the build.gradle script to provide the correct path")
     }
 
+    def linux_x86 = new File(jdkLinux_x86)
+
+    if(!linux_x86.exists())
+    {
+        println("Linux x86 JDK was not found at " + jdkLinux_x86)
+        throw new GradleException("Cannot find Java Development Kit (JDK) for linux-x86 32-bit architecture.  " +
+                "Please update the build.gradle script to provide the correct path")
+    }
+
     def osx_x64 = new File(jdkOsx_x64)
 
     if(!osx_x64.exists())
@@ -164,6 +177,15 @@ tasks.runtime.doFirst {
                 "Please update the build.gradle script to provide the correct path")
     }
 
+    def windows_x86 = new File(jdkWindows_x86)
+
+    if(!windows_x86.exists())
+    {
+        println("Windows x86 32-bit JDK was not found at " + jdkWindows_x86)
+        throw new GradleException("Cannot find Java Development Kit (JDK) for windows-x64 architecture.  " +
+                "Please update the build.gradle script to provide the correct path")
+    }
+
 //    def linux_aarch64 = new File(jdkLinux_aarch64)
 //
 //    if(!linux_aarch64.exists())
@@ -189,8 +211,10 @@ tasks.runtime.doFirst {
  */
 tasks.runtime.doLast {
     delete(fileTree('build/image/sdr-trunk-linux-x64/lib').include { it.name ==~ /javafx.*-(win|mac)\.jar/ })
+    delete(fileTree('build/image/sdr-trunk-linux-x86/lib').include { it.name ==~ /javafx.*-(win|mac)\.jar/ })
     delete(fileTree('build/image/sdr-trunk-osx-x64/lib').include { it.name ==~ /javafx.*-(win|linux)\.jar/ })
     delete(fileTree('build/image/sdr-trunk-windows-x64/lib').include { it.name ==~ /javafx.*-(linux|mac)\.jar/ })
+    delete(fileTree('build/image/sdr-trunk-windows-x86/lib').include { it.name ==~ /javafx.*-(linux|mac)\.jar/ })
 
 //    delete(fileTree('build/image/sdr-trunk-linux-aarch64/lib').include { it.name ==~ /javafx.*-(win|mac)\.jar/ })
 //    delete(fileTree('build/image/sdr-trunk-linux-arm32/lib').include { it.name ==~ /javafx.*-(win|mac)\.jar/ })
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f0d05de5..054894d3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,25 +1,27 @@
 #
-# *******************************************************************************
-# sdrtrunk
-# Copyright (C) 2014-2019 Dennis Sheirer
+# /*
+#  * ******************************************************************************
+#  * Copyright (C) 2014-2019 Dennis Sheirer
+#  *
+#  * This program is free software: you can redistribute it and/or modify
+#  * it under the terms of the GNU General Public License as published by
+#  * the Free Software Foundation, either version 3 of the License, or
+#  * (at your option) any later version.
+#  *
+#  * This program is distributed in the hope that it will be useful,
+#  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  * GNU General Public License for more details.
+#  *
+#  * You should have received a copy of the GNU General Public License
+#  * along with this program.  If not, see <http://www.gnu.org/licenses/>
+#  * *****************************************************************************
+#  */
 #
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>
-# ******************************************************************************
 #
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists