diff --git a/build.gradle b/build.gradle
index 4398489..970cb32 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,13 +7,9 @@ plugins {
 
 repositories {
     mavenCentral()
-    maven {
-        // SWT libraries (historical, need a better site)
-        url "http://maven-eclipse.github.io/maven"
-    }
     flatDir {
-        // SWT libraries (hand-generated SWT for Pi)
-        dirs "./rpi-lib"
+        // SWT libraries
+        dirs "./swt-lib"
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index c91a417..006a040 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,7 +7,7 @@ version=1.7.0pre
 shkVersion=1.2.2
 asVersion=1.2.1
 btVersion=0.3.1
-swtVersion=4.6.1
+swtVersion=4.17
 piswtVersion=3.8.2
 junitVersion=4.12
 antVersion=1.8.2
diff --git a/swt-lib/org.eclipse.swt.cocoa.macosx.x86_64-4.17.jar b/swt-lib/org.eclipse.swt.cocoa.macosx.x86_64-4.17.jar
new file mode 100644
index 0000000..03724dd
Binary files /dev/null and b/swt-lib/org.eclipse.swt.cocoa.macosx.x86_64-4.17.jar differ
diff --git a/swt-lib/org.eclipse.swt.gtk.linux.aarch64-4.17.jar b/swt-lib/org.eclipse.swt.gtk.linux.aarch64-4.17.jar
new file mode 100644
index 0000000..bd159af
Binary files /dev/null and b/swt-lib/org.eclipse.swt.gtk.linux.aarch64-4.17.jar differ
diff --git a/rpi-lib/org.eclipse.swt.gtk.linux.arm-3.8.2.jar b/swt-lib/org.eclipse.swt.gtk.linux.arm-3.8.2.jar
similarity index 100%
rename from rpi-lib/org.eclipse.swt.gtk.linux.arm-3.8.2.jar
rename to swt-lib/org.eclipse.swt.gtk.linux.arm-3.8.2.jar
diff --git a/swt-lib/org.eclipse.swt.gtk.linux.x86_64-4.17.jar b/swt-lib/org.eclipse.swt.gtk.linux.x86_64-4.17.jar
new file mode 100644
index 0000000..0d23b19
Binary files /dev/null and b/swt-lib/org.eclipse.swt.gtk.linux.x86_64-4.17.jar differ
diff --git a/swt-lib/org.eclipse.swt.win32.win32.x86_64-4.17.jar b/swt-lib/org.eclipse.swt.win32.win32.x86_64-4.17.jar
new file mode 100644
index 0000000..8b00aea
Binary files /dev/null and b/swt-lib/org.eclipse.swt.win32.win32.x86_64-4.17.jar differ