diff --git a/history.txt b/history.txt
index 8492ddc8a4..f3f620c2d3 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,6 @@
 2015-05-03 zzz
+ * Router: Allow class M to become floodfill;
+   add bandwidth classes P and X (ticket #1447)
  * SusiDNS: Add export button
 
 2015-05-02 zzz
diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java
index 18d012ae53..ea55021edc 100644
--- a/router/java/src/net/i2p/router/Router.java
+++ b/router/java/src/net/i2p/router/Router.java
@@ -898,14 +898,12 @@ public class Router implements RouterClock.ClockShiftListener {
         } else if (bwLim <= 2000) {    // TODO adjust threshold
             // 512 supported as of 0.9.18;
             // Add 256 as well for compatibility
-            // TODO uncomment
-            //ri.addCapability(CAPABILITY_BW512);
+            ri.addCapability(CAPABILITY_BW512);
             ri.addCapability(CAPABILITY_BW256);
         } else {
             // Unlimited supported as of 0.9.18;
             // Add 256 as well for compatibility
-            // TODO uncomment
-            //ri.addCapability(CAPABILITY_BW_UNLIMITED);
+            ri.addCapability(CAPABILITY_BW_UNLIMITED);
             ri.addCapability(CAPABILITY_BW256);
         }
         
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 7f4edb9752..31c35f8c3e 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 13;
+    public final static long BUILD = 14;
 
     /** for example "-test" */
     public final static String EXTRA = "";
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java
index eafa0c068c..6ea2165452 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java
@@ -109,8 +109,9 @@ class FloodfillMonitorJob extends JobImpl {
         if (ri == null)
             return false;
         char bw = ri.getBandwidthTier().charAt(0);
-        // Only if class N, O, P, X
-        if (bw != Router.CAPABILITY_BW128 && bw != Router.CAPABILITY_BW256 &&
+        // Only if class M, N, O, P, X
+        if (bw != Router.CAPABILITY_BW64 &&
+            bw != Router.CAPABILITY_BW128 && bw != Router.CAPABILITY_BW256 &&
             bw != Router.CAPABILITY_BW512 && bw != Router.CAPABILITY_BW_UNLIMITED)
             return false;