diff --git a/jul-to-slf4j/src/main/java/org/slf4j/bridge/SLF4JBridgeHandler.java b/jul-to-slf4j/src/main/java/org/slf4j/bridge/SLF4JBridgeHandler.java
index 72576a03..d30fe7b7 100755
--- a/jul-to-slf4j/src/main/java/org/slf4j/bridge/SLF4JBridgeHandler.java
+++ b/jul-to-slf4j/src/main/java/org/slf4j/bridge/SLF4JBridgeHandler.java
@@ -36,7 +36,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.spi.LocationAwareLogger;
 
-// Based on http://bugzilla.slf4j.org/show_bug.cgi?id=38
+// Based on http://jira.qos.ch/browse/SLF4J-30
 
 /**
  * <p>Bridge/route all JUL log records to the SLF4J API.</p>
@@ -259,7 +259,7 @@ public class SLF4JBridgeHandler extends Handler {
         }
         Object[] params = record.getParameters();
         // avoid formatting when there are no or 0 parameters. see also
-        // http://bugzilla.slf4j.org/show_bug.cgi?id=212
+        // http://jira.qos.ch/browse/SLF4J-203
         if (params != null && params.length > 0) {
             message = MessageFormat.format(message, params);
         }
@@ -289,7 +289,7 @@ public class SLF4JBridgeHandler extends Handler {
         // this is a check to avoid calling the underlying logging system
         // with a null message. While it is legitimate to invoke j.u.l. with
         // a null message, other logging frameworks do not support this.
-        // see also http://bugzilla.slf4j.org/show_bug.cgi?id=108
+        // see also http://jira.qos.ch/browse/SLF4J-99
         if (message == null) {
             message = "";
         }
diff --git a/log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java b/log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java
index c1e72dcd..609011ff 100644
--- a/log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java
+++ b/log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java
@@ -291,7 +291,7 @@ public class Category {
         log(FQCN, p, msg, t);
     }
 
-    // See also http://bugzilla.slf4j.org/show_bug.cgi?id=168
+    // See also http://jira.qos.ch/browse/SLF4J-159
     public void log(String FQCN, Priority p, Object msg, Throwable t) {
         int levelInt = priorityToLevelInt(p);
         differentiatedLog(null, FQCN, levelInt, msg, t);
diff --git a/log4j-over-slf4j/src/main/java/org/apache/log4j/LogManager.java b/log4j-over-slf4j/src/main/java/org/apache/log4j/LogManager.java
index 51c9c85d..57b6b25f 100644
--- a/log4j-over-slf4j/src/main/java/org/apache/log4j/LogManager.java
+++ b/log4j-over-slf4j/src/main/java/org/apache/log4j/LogManager.java
@@ -51,7 +51,7 @@ public class LogManager {
 
     /**
      * Returns a logger instance created by loggerFactory. This method was requested in
-     * <a href="http://bugzilla.slf4j.org/show_bug.cgi?id=234">bug #234</a>. Note that
+     * <a href="http://jira.qos.ch/browse/SLF4J-225">SLF4J-225</a>. Note that
      * log4j-over-slf4j does not ship with a LoggerFactory implementation. If this
      * method is called, the caller must provide his/her own implementation.
      *
diff --git a/pom.xml b/pom.xml
index 810eb0c5..da67b6fb 100755
--- a/pom.xml
+++ b/pom.xml
@@ -222,7 +222,7 @@
         </configuration>
       </plugin>
 
-      <!-- as suggested in http://bugzilla.slf4j.org/show_bug.cgi?id=152 -->
+      <!-- as suggested in http://jira.qos.ch/browse/SLF4J-143 -->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
diff --git a/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java b/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java
index 2f74c18b..b5596581 100755
--- a/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java
+++ b/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java
@@ -339,7 +339,7 @@ public final class LoggerFactory {
             throw new IllegalStateException(UNSUCCESSFUL_INIT_MSG);
         case ONGOING_INITIALIZATION:
             // support re-entrant behavior.
-            // See also http://bugzilla.slf4j.org/show_bug.cgi?id=106
+            // See also http://jira.qos.ch/browse/SLF4J-97
             return TEMP_FACTORY;
         }
         throw new IllegalStateException("Unreachable code");
diff --git a/slf4j-ext/src/main/java/org/slf4j/ext/XLogger.java b/slf4j-ext/src/main/java/org/slf4j/ext/XLogger.java
index 06f01626..9a102258 100644
--- a/slf4j-ext/src/main/java/org/slf4j/ext/XLogger.java
+++ b/slf4j-ext/src/main/java/org/slf4j/ext/XLogger.java
@@ -102,7 +102,7 @@ public class XLogger extends LoggerWrapper implements Logger {
     public XLogger(Logger logger) {
         // If class B extends A, assuming B does not override method x(), the caller
         // of new B().x() is A and not B, see also
-        // http://bugzilla.slf4j.org/show_bug.cgi?id=114
+        // http://jira.qos.ch/browse/SLF4J-105
         super(logger, LoggerWrapper.class.getName());
     }
 
diff --git a/slf4j-ext/src/test/java/org/slf4j/dummyExt/XLoggerTest.java b/slf4j-ext/src/test/java/org/slf4j/dummyExt/XLoggerTest.java
index 33940cfc..3ec64447 100644
--- a/slf4j-ext/src/test/java/org/slf4j/dummyExt/XLoggerTest.java
+++ b/slf4j-ext/src/test/java/org/slf4j/dummyExt/XLoggerTest.java
@@ -128,10 +128,11 @@ public class XLoggerTest extends TestCase {
         verifyWithLevelAndException((LoggingEvent) listAppender.list.get(1), XLogger.Level.DEBUG, "catching", t);
     }
 
-    // See http://bugzilla.slf4j.org/show_bug.cgi?id=114
+    // See http://jira.qos.ch/browse/SLF4J-105
+    // formerly http://bugzilla.slf4j.org/show_bug.cgi?id=114
     public void testLocationExtraction_Bug114() {
         XLogger logger = XLoggerFactory.getXLogger("UnitTest");
-        int line = 135; // requires update if line numbers change
+        int line = 136; // requires update if line numbers change
         logger.exit();
         logger.debug("hello");
 
diff --git a/slf4j-jdk14/src/main/java/org/slf4j/impl/JDK14LoggerAdapter.java b/slf4j-jdk14/src/main/java/org/slf4j/impl/JDK14LoggerAdapter.java
index 86d9cbf7..87a2aeb0 100755
--- a/slf4j-jdk14/src/main/java/org/slf4j/impl/JDK14LoggerAdapter.java
+++ b/slf4j-jdk14/src/main/java/org/slf4j/impl/JDK14LoggerAdapter.java
@@ -644,7 +644,7 @@ public final class JDK14LoggerAdapter extends MarkerIgnoringBase implements Loca
         // construction of location data for disabled log
         // statements. As of 2008-07-31, callers of this method
         // do not perform this check. See also
-        // http://bugzilla.slf4j.org/show_bug.cgi?id=90
+        // http://jira.qos.ch/browse/SLF4J-81
         if (logger.isLoggable(julLevel)) {
             log(callerFQCN, julLevel, message, argArray, t);
         }
diff --git a/slf4j-jdk14/src/test/java/org/slf4j/issue/LoggerSerializationTest.java b/slf4j-jdk14/src/test/java/org/slf4j/issue/LoggerSerializationTest.java
index bb9b8745..bbf4e561 100644
--- a/slf4j-jdk14/src/test/java/org/slf4j/issue/LoggerSerializationTest.java
+++ b/slf4j-jdk14/src/test/java/org/slf4j/issue/LoggerSerializationTest.java
@@ -39,7 +39,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * See http://bugzilla.slf4j.org/show_bug.cgi?id=261
+ * See http://jira.qos.ch/browse/SLF4J-252
  * @author Thorbjorn Ravn Andersen
  */
 public class LoggerSerializationTest extends TestCase {
diff --git a/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jLoggerAdapter.java b/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jLoggerAdapter.java
index 08d3ea0e..fafd79e5 100755
--- a/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jLoggerAdapter.java
+++ b/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jLoggerAdapter.java
@@ -48,7 +48,7 @@ import org.slf4j.spi.LocationAwareLogger;
  * The TRACE level was introduced in log4j version 1.2.12. In order to avoid
  * crashing the host application, in the case the log4j version in use predates
  * 1.2.12, the TRACE level will be mapped as DEBUG. See also <a
- * href="http://bugzilla.slf4j.org/show_bug.cgi?id=68">bug 68</a>.
+ * href="http://jira.qos.ch/browse/SLF4J-59">SLF4J-59</a>.
  * 
  * @author Ceki G&uuml;lc&uuml;
  */
diff --git a/slf4j-log4j12/src/test/java/org/slf4j/InvocationTest.java b/slf4j-log4j12/src/test/java/org/slf4j/InvocationTest.java
index b3246f50..01f64154 100644
--- a/slf4j-log4j12/src/test/java/org/slf4j/InvocationTest.java
+++ b/slf4j-log4j12/src/test/java/org/slf4j/InvocationTest.java
@@ -106,7 +106,8 @@ public class InvocationTest extends TestCase {
         assertEquals(8, listAppender.list.size());
     }
 
-    // http://bugzilla.slf4j.org/show_bug.cgi?id=78
+    // http://jira.qos.ch/browse/SLF4J-69
+    // formerly http://bugzilla.slf4j.org/show_bug.cgi?id=78
     public void testNullParameter_BUG78() {
         Logger logger = LoggerFactory.getLogger("testNullParameter_BUG78");
         String[] parameters = null;
diff --git a/slf4j-simple/src/test/java/org/slf4j/InvocationTest.java b/slf4j-simple/src/test/java/org/slf4j/InvocationTest.java
index 6842d07c..3139c448 100644
--- a/slf4j-simple/src/test/java/org/slf4j/InvocationTest.java
+++ b/slf4j-simple/src/test/java/org/slf4j/InvocationTest.java
@@ -80,7 +80,8 @@ public class InvocationTest extends TestCase {
         logger.error("Hello world 4.", e);
     }
 
-    // http://bugzilla.slf4j.org/show_bug.cgi?id=78
+    // http://jira.qos.ch/browse/SLF4J-69
+    // formerly http://bugzilla.slf4j.org/show_bug.cgi?id=78
     public void testNullParameter_BUG78() {
         Logger logger = LoggerFactory.getLogger("testNullParameter_BUG78");
         String[] parameters = null;