diff --git a/core/java/src/net/i2p/crypto/SU3File.java b/core/java/src/net/i2p/crypto/SU3File.java
index b401c8f280cd4c7462d9e4a1726253dc67573d1a..1794b0ac47e9b3748ac0f6015bd43f5086f74c83 100644
--- a/core/java/src/net/i2p/crypto/SU3File.java
+++ b/core/java/src/net/i2p/crypto/SU3File.java
@@ -513,14 +513,16 @@ public class SU3File {
     /** @since 0.9.9 */
     private static String dumpTypes() {
         StringBuilder buf = new StringBuilder(256);
-        buf.append("Available signature types:\n");
+        buf.append("Available signature types (-t):\n");
         for (SigType t : EnumSet.allOf(SigType.class)) {
             buf.append("      ").append(t).append("\t(code: ").append(t.getCode()).append(')');
             if (t.getCode() == DEFAULT_SIG_CODE)
                 buf.append(" DEFAULT");
+            if (!t.isAvailable())
+                buf.append(" UNAVAILABLE");
             buf.append('\n');
         }
-        buf.append("Available content types:\n");
+        buf.append("Available content types (-c):\n");
         for (ContentType t : EnumSet.allOf(ContentType.class)) {
             buf.append("      ").append(t).append("\t(code: ").append(t.getCode()).append(')');
             if (t == DEFAULT_CONTENT_TYPE)
diff --git a/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java b/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java
index 8c100ef5f14143ad3c8198db0ef293c879535049..5bbfd1394daf1ce45de27e28f4bf6fedb8c8f375 100644
--- a/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java
+++ b/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java
@@ -498,6 +498,8 @@ public class Reseeder {
                         name.equals(ourB64) ||
                         f.length() > 10*1024 ||
                         f.lastModified() < minTime ||
+                        !name.startsWith(ROUTERINFO_PREFIX) ||
+                        !name.endsWith(ROUTERINFO_SUFFIX) ||
                         !f.isFile()) {
                         if (_log.shouldLog(Log.WARN))
                             _log.warn("Skipping " + f);