diff --git a/build.gradle b/build.gradle
index 9451258b58..2a79564e5f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,12 +8,14 @@ buildscript {
         classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.10'
         classpath 'com.google.gradle:osdetector-gradle-plugin:1.6.0'
         classpath 'com.github.jengelman.gradle.plugins:shadow:5.2.0'
+        classpath 'org.openjfx:javafx-plugin:0.0.10'
         classpath files('gradle/witness/gradle-witness.jar')
         classpath 'org.springframework.boot:spring-boot-gradle-plugin:1.5.10.RELEASE'
     }
 }
 
 configure(rootProject) {
+
     // remove the 'bisq-*' scripts and 'lib' dir generated by the 'installDist' task
     task clean {
         doLast {
@@ -230,11 +232,16 @@ configure(project(':assets')) {
 
 
 configure(project(':common')) {
+    apply plugin: 'org.openjfx.javafxplugin'
+
+    javafx {
+        version = "$javafxVersion"
+        modules =  ['javafx.graphics']
+    }
+
     dependencies {
         compile project(':proto')
         implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
-        compile "org.openjfx:javafx-base:$javafxVersion:$os"
-        compile "org.openjfx:javafx-graphics:$javafxVersion:$os"
         compile "com.google.protobuf:protobuf-java:$protobufVersion"
         compile "com.google.code.gson:gson:$gsonVersion"
         compile "net.sf.jopt-simple:jopt-simple:$joptVersion"
@@ -271,6 +278,13 @@ configure(project(':common')) {
 
 
 configure(project(':p2p')) {
+    apply plugin: 'org.openjfx.javafxplugin'
+
+    javafx {
+        version = "$javafxVersion"
+        modules =  ['javafx.base']
+    }
+
     dependencies {
         compile project(':common')
         compile("com.github.bisq-network.netlayer:tor.native:$netlayerVersion") {
@@ -304,6 +318,13 @@ configure(project(':p2p')) {
 
 
 configure(project(':core')) {
+    apply plugin: 'org.openjfx.javafxplugin'
+
+    javafx {
+        version = "$javafxVersion"
+        modules =  ['javafx.base']
+    }
+
     dependencies {
         compile project(':proto')
         compile project(':assets')
@@ -381,10 +402,16 @@ configure(project(':cli')) {
 
 configure(project(':desktop')) {
     apply plugin: 'com.github.johnrengelman.shadow'
+    apply plugin: 'org.openjfx.javafxplugin'
     apply plugin: 'witness'
     apply from: '../gradle/witness/gradle-witness.gradle'
     apply from: 'package/package.gradle'
 
+    javafx {
+        version = "$javafxVersion"
+        modules =  ['javafx.controls', 'javafx.fxml']
+    }
+
     version = '1.6.4-SNAPSHOT'
 
     jar.manifest.attributes(
@@ -408,9 +435,6 @@ configure(project(':desktop')) {
         compile "de.jensd:fontawesomefx-materialdesignfont:$fontawesomefxMaterialdesignfontVersion"
         compile "com.google.guava:guava:$guavaVersion"
         compile "com.googlecode.jcsv:jcsv:$jcsvVersion"
-        compile "org.openjfx:javafx-controls:$javafxVersion:$os"
-        compile "org.openjfx:javafx-fxml:$javafxVersion:$os"
-        compile "org.openjfx:javafx-swing:$javafxVersion:$os"
         compile "com.jfoenix:jfoenix:$jfoenixVersion"
 
         compileOnly "org.projectlombok:lombok:$lombokVersion"
@@ -429,6 +453,13 @@ configure(project(':desktop')) {
 
 
 configure(project(':monitor')) {
+    apply plugin: 'org.openjfx.javafxplugin'
+
+    javafx {
+        version = "$javafxVersion"
+        modules =  ['javafx.base']
+    }
+
     mainClassName = 'bisq.monitor.Monitor'
 
     test {