diff --git a/pom.xml b/pom.xml
index f60923d59..15df379fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,6 +130,12 @@
 			<artifactId>java-jwt</artifactId>
 			<version>${jwt.version}</version>
 		</dependency>
+		<dependency> <!-- TMP waiting for upstream fix: https://github.com/auth0/java-jwt/pull/484 -->
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>2.11.0</version>
+		</dependency>
+
 
 		<!-- EasyBind -->
 		<dependency>
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
new file mode 100644
index 000000000..519c6199e
--- /dev/null
+++ b/src/main/java/module-info.java
@@ -0,0 +1,63 @@
+import org.cryptomator.integrations.autostart.AutoStartProvider;
+import org.cryptomator.integrations.keychain.KeychainAccessProvider;
+import org.cryptomator.integrations.tray.TrayIntegrationProvider;
+import org.cryptomator.integrations.uiappearance.UiAppearanceProvider;
+
+module org.cryptomator.desktop {
+	requires org.cryptomator.cryptofs;
+	requires org.cryptomator.frontend.dokany;
+	requires org.cryptomator.frontend.fuse;
+	requires org.cryptomator.frontend.webdav;
+	requires org.cryptomator.integrations.api;
+	requires java.rmi;
+	requires java.desktop;
+	requires java.net.http;
+	requires javafx.base;
+	requires javafx.graphics;
+	requires javafx.controls;
+	requires javafx.fxml;
+	requires com.tobiasdiez.easybind;
+	requires com.google.common;
+	requires com.google.gson; // really?
+	requires org.slf4j;
+	requires org.apache.commons.lang3;
+
+	/* TODO: filename-based modules: */
+	requires dagger;
+	requires static javax.inject; /* ugly dagger/guava crap */
+	requires static jsr305; /* ugly dagger/guava crap */
+	requires java.jwt;
+	requires com.fasterxml.jackson.databind; // TODO: tmp fix, waiting for https://github.com/auth0/java-jwt/pull/484
+	requires zxcvbn;
+	requires logback.classic;
+	requires logback.core;
+
+	uses AutoStartProvider;
+	uses KeychainAccessProvider;
+	uses TrayIntegrationProvider;
+	uses UiAppearanceProvider;
+
+	opens org.cryptomator.common.settings to com.google.gson;
+
+	opens org.cryptomator.launcher to java.rmi;
+
+	opens org.cryptomator.common to javafx.fxml;
+	opens org.cryptomator.common.vaults to javafx.fxml;
+	opens org.cryptomator.ui.addvaultwizard to javafx.fxml;
+	opens org.cryptomator.ui.changepassword to javafx.fxml;
+	opens org.cryptomator.ui.common to javafx.fxml;
+	opens org.cryptomator.ui.controls to javafx.fxml;
+	opens org.cryptomator.ui.forgetPassword to javafx.fxml;
+	opens org.cryptomator.ui.fxapp to javafx.fxml;
+	opens org.cryptomator.ui.keyloading.masterkeyfile to javafx.fxml;
+	opens org.cryptomator.ui.mainwindow to javafx.fxml;
+	opens org.cryptomator.ui.migration to javafx.fxml;
+	opens org.cryptomator.ui.preferences to javafx.fxml;
+	opens org.cryptomator.ui.quit to javafx.fxml;
+	opens org.cryptomator.ui.recoverykey to javafx.fxml;
+	opens org.cryptomator.ui.removevault to javafx.fxml;
+	opens org.cryptomator.ui.stats to javafx.fxml;
+	opens org.cryptomator.ui.unlock to javafx.fxml;
+	opens org.cryptomator.ui.vaultoptions to javafx.fxml;
+	opens org.cryptomator.ui.wrongfilealert to javafx.fxml;
+}
\ No newline at end of file