diff --git a/ts3-client/swing/pom.xml b/ts3-client/swing/pom.xml
index 042254a..3ae2101 100644
--- a/ts3-client/swing/pom.xml
+++ b/ts3-client/swing/pom.xml
@@ -39,7 +39,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>3.6.2</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -47,10 +47,34 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
+                            <!--
+                                Tree-shake the dependencies: only a fraction of Bouncy Castle
+                                (the lightweight EC/AES-EAX API) is actually reachable.
+                            -->
+                            <minimizeJar>true</minimizeJar>
                             <filters>
+                                <!-- Our own modules are entry points; keep them whole. -->
+                                <filter>
+                                    <artifact>com.ts3client:*</artifact>
+                                    <includes>
+                                        <include>**</include>
+                                    </includes>
+                                </filter>
+                                <filter>
+                                    <artifact>com.github.manevolent:ts3j</artifact>
+                                    <includes>
+                                        <include>**</include>
+                                    </includes>
+                                </filter>
                                 <filter>
                                     <artifact>*:*</artifact>
                                     <excludes>
+                                        <!--
+                                            The shaded jar is not a multi-release jar, so the
+                                            versioned copies (all Bouncy Castle's) are never loaded,
+                                            and minimizeJar does not tree-shake them either.
+                                        -->
+                                        <exclude>META-INF/versions/**</exclude>
                                         <exclude>META-INF/*.SF</exclude>
                                         <exclude>META-INF/*.DSA</exclude>
                                         <exclude>META-INF/*.RSA</exclude>
diff --git a/ts3j b/ts3j
index db57d60..dce4e68 160000
--- a/ts3j
+++ b/ts3j
@@ -1 +1 @@
-Subproject commit db57d60c989e399626aa16d921390f5033e6cdeb
+Subproject commit dce4e681500c85efdf9b9f680da8e31c19bf2d08