diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java
index 7164ffeef64d11ed1b716ea3cc142ac1ad0d647d..b9cc54fd54c745aad6b02e1092d81c8186f25f2e 100644
--- a/core/src/main/java/hudson/ClassicPluginStrategy.java
+++ b/core/src/main/java/hudson/ClassicPluginStrategy.java
@@ -417,7 +417,8 @@ public class ClassicPluginStrategy implements PluginStrategy {
             new DetachedPlugin("windows-slaves", "1.547.*", "1.0"),
             new DetachedPlugin("antisamy-markup-formatter", "1.553.*", "1.0"),
             new DetachedPlugin("matrix-project", "1.561.*", "1.0"),
-            new DetachedPlugin("junit", "1.577.*", "1.0")
+            new DetachedPlugin("junit", "1.577.*", "1.0"),
+            new DetachedPlugin("bouncycastle-api", "2.16.*", "2.16.0-SNAPSHOT") // TODO remove -SNAPSHOT
     ));
 
     /** Implicit dependencies that are known to be unnecessary and which must be cut out to prevent a dependency cycle among bundled plugins. */
diff --git a/war/pom.xml b/war/pom.xml
index 5843b3ceaf02165b4936ae70375416bc91f0a4d8..6af7f951c965dd338753d3cfcc9002fe642444f0 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -101,12 +101,6 @@ THE SOFTWARE.
       <artifactId>instance-identity</artifactId>
       <version>2.0</version>
     </dependency>
-    <dependency>
-      <!-- TODO remove once bouncycastle-api plugin bundles bouncycastle -->
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
-      <version>1.54</version>
-    </dependency>
     <dependency>
       <groupId>org.jenkins-ci.modules</groupId>
       <artifactId>ssh-cli-auth</artifactId>
@@ -411,6 +405,12 @@ THE SOFTWARE.
                   <version>1.2-beta-4</version>
                   <type>hpi</type>
                 </artifactItem>
+                <artifactItem>
+                  <groupId>org.jenkins-ci.plugins</groupId>
+                  <artifactId>bouncycastle-api</artifactId>
+                  <version>2.16.0-SNAPSHOT</version>  <!-- TODO remove SNAPSHOT -->
+                  <type>hpi</type>
+                </artifactItem>
               </artifactItems>
               <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/detached-plugins</outputDirectory>
               <stripVersion>true</stripVersion>