diff --git a/gson/bnd.bnd b/gson/bnd.bnd
index 57a8657fd8..07746f0a48 100644
--- a/gson/bnd.bnd
+++ b/gson/bnd.bnd
@@ -6,6 +6,10 @@ Bundle-ContactAddress: ${project.parent.url}
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7, JavaSE-1.8
 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.6))"
 
+# Optional dependency for JDK's sun.misc.Unsafe
+# https://bnd.bndtools.org/chapters/920-faq.html#remove-unwanted-imports-
+Import-Package: sun.misc;resolution:=optional, *
+
 -removeheaders: Private-Package
 
 -exportcontents:\
diff --git a/gson/src/main/java/module-info.java b/gson/src/main/java/module-info.java
index 38c26e569c..0134c9dc19 100644
--- a/gson/src/main/java/module-info.java
+++ b/gson/src/main/java/module-info.java
@@ -10,4 +10,7 @@
 
 	// Optional dependency on java.sql
 	requires static java.sql;
+
+	// Optional dependency on jdk.unsupported for JDK's sun.misc.Unsafe
+	requires static jdk.unsupported;
 }