diff --git a/ChangeLog b/ChangeLog
index 749e94f..5505fed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Version 1.61b:
+--------------
+
+  - Further refinements to content classifier.
+
 Version 1.60b:
 --------------
 
diff --git a/Makefile b/Makefile
index 6c380b2..4017cf2 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@
 #
 
 PROGNAME   = skipfish
-VERSION    = 1.60b
+VERSION    = 1.61b
 
 OBJFILES   = http_client.c database.c crawler.c analysis.c report.c
 INCFILES   = alloc-inl.h string-inl.h debug.h types.h http_client.h \
diff --git a/analysis.c b/analysis.c
index 6ead0b9..ea3c42b 100644
--- a/analysis.c
+++ b/analysis.c
@@ -2353,7 +2353,7 @@ static void check_for_stuff(struct http_request* req,
       while (*x && (isalnum(*x) || strchr("./*!+=$", *x)) &&
              (x - sniffbuf) < 128) x++;
 
-      if (*x == ':' || !*x || isspace(*x))
+      if (*x == ':' || !*x || *x == '\r' || *x == '\n')
         problem(PROB_FILE_POI, req, res, (u8*)
                 "Possible password file", req->pivot, 0);
 
diff --git a/config.h b/config.h
index 764f221..6cdbb50 100644
--- a/config.h
+++ b/config.h
@@ -240,10 +240,10 @@ static const char* form_suggestion[][2] = {
   { "site"     , "http://example.com/?sfish_form_test" },
   { "domain"   , "example.com" },
   { "search"   , "a" },
-  { "comment"  , "jellyfish" },
-  { "desc"     , "jellyfish" },
-  { "title"    , "jellyfish" },
-  { "subject"  , "jellyfish" },
+  { "comment"  , "skipfish" },
+  { "desc"     , "skipfish" },
+  { "title"    , "skipfish" },
+  { "subject"  , "skipfish" },
   { NULL       , "1" }
 
 };