diff --git a/changelog.html b/changelog.html
index 5482f9288f09644b89ad63ab43a079a5362fa65d..37f330dbf87a71c76c2791bb7b0caec9df5e0cea 100644
--- a/changelog.html
+++ b/changelog.html
@@ -65,6 +65,11 @@ Upcoming changes</a>
     Fix launching browser too early to http://localhost:8080 in OS X
     installer.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-12622">issue 12622</a>)
+  <li class="bug">
+    Bundled slf4j binding to avoid classloader contraint violation in JBoss
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-12334">issue 12334</a>,
+     <a href="https://issues.jenkins-ci.org/browse/JENKINS-12446">issue 12446</a>,
+     <a href="https://issues.jenkins-ci.org/browse/JENKINS-12650">issue 12650</a>)
   <li class="bug">
     Fixed a UI problem with the "save" button that sticks to the bottom.
   <li class="rfe">
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index f86693946f769a8d73905474947cfaf147fa23b7..8a1a8d98f8fe7f5e09bdef584a2912455a161875 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -47,7 +47,6 @@ THE SOFTWARE.
     <aetherVersion>1.13.1</aetherVersion>
     <sisuInjectVersion>2.3.0</sisuInjectVersion>
     <wagonVersion>2.2</wagonVersion>
-    <slf4jVersion>1.6.2</slf4jVersion> <!-- < 1.6.x version didn't specify the license (MIT) -->
   </properties>
 
   <issueManagement>
@@ -55,31 +54,6 @@ THE SOFTWARE.
     <url>https://issues.jenkins-ci.org/browse/JENKINS/component/15487</url>
   </issueManagement>
 
-  <dependencyManagement>
-    <dependencies>
-      <!-- SLF4J is used by wagon-webdav-jackrabbit dep --> 
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <version>${slf4jVersion}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-nop</artifactId>
-        <version>${slf4jVersion}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-jdk14</artifactId>
-        <version>${slf4jVersion}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>jcl-over-slf4j</artifactId>
-        <version>${slf4jVersion}</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
   <dependencies>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
@@ -354,7 +328,7 @@ THE SOFTWARE.
       <artifactId>wagon-webdav-jackrabbit</artifactId>
       <version>${wagonVersion}</version>
       <exclusions>
-        <exclusion><!-- bundling binding creates a problem with app servers that use different versions of slf4j -->
+        <exclusion><!-- jcl-over-slf4j version needs to match with slf4j-api version, which makes this fragile. let's not try to intercept jcl calls -->
           <groupId>org.slf4j</groupId>
           <artifactId>jcl-over-slf4j</artifactId>
         </exclusion>
diff --git a/pom.xml b/pom.xml
index 44a96405b367156d67858daf25e3151a4b4cdbaa..726ee33186c9361e70568f3baf110077467fb951 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,6 +89,7 @@ THE SOFTWARE.
     <project.patchManagement.url>https://api.github.com</project.patchManagement.url>
     <patch.tracker.serverId>jenkins-jira</patch.tracker.serverId>
 
+    <slf4jVersion>1.6.2</slf4jVersion> <!-- < 1.6.x version didn't specify the license (MIT) -->
   </properties>
 
 
@@ -205,6 +206,27 @@ THE SOFTWARE.
         <version>3.1.0</version>
       </dependency>
 
+      <!-- SLF4J used in maven-plugin and core -->
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>${slf4jVersion}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-nop</artifactId>
+        <version>${slf4jVersion}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-jdk14</artifactId>
+        <version>${slf4jVersion}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>jcl-over-slf4j</artifactId>
+        <version>${slf4jVersion}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <dependencies>
diff --git a/war/pom.xml b/war/pom.xml
index 00f450b92bf4279d5a1c9a17e74bb74bffc9bd56..a2c8e28a4ba80d214d167b9d10b5c92b4604dfb4 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -117,9 +117,32 @@ THE SOFTWARE.
       <artifactId>sshd</artifactId>
       <version>1.2</version>
     </dependency>
+    <dependency>
+      <!--
+        We bundle slf4j binding since we got some components (sshd for example)
+        that uses slf4j.
+
+        The problem with not shipping any binding in the war is that if the
+        servlet container does use slf4j in itself, then we got a classloader
+        constraint violation (see JENKINS-12334) as we try to load StaticLoggerBinder
+        which resides in the binding jar (this jar would be from container implementation,
+        which relies on slf4j api in the container, when we have our own slf4j API jar
+        statically depending on the binding jar.)
+
+        We also get tickets like JENKINS-12650 for not reporting logs at all
+        (although this is a non-fatal problem.)
+
+        The downside of adding a jar is that we can potentially get "multiple binding jar"
+        warning like http://www.slf4j.org/codes.html, but that's at least non-fatal.
+      -->
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-jdk14</artifactId>
+    </dependency>
+
 
     <!-- offline profiler API when we need it -->
-    <!--dependency>
+
+    <!--dependency
       <groupId>com.yourkit.api</groupId>
       <artifactId>yjp</artifactId>
       <version>dontcare</version>