diff --git a/src/checkbufferoverrun.cpp b/src/checkbufferoverrun.cpp
index 3f0892266..9f9c510dc 100644
--- a/src/checkbufferoverrun.cpp
+++ b/src/checkbufferoverrun.cpp
@@ -62,7 +62,7 @@ void CheckBufferOverrunClass::bufferOverrun(const Token *tok)
 
 void CheckBufferOverrunClass::strncatUsage(const Token *tok)
 {
-    reportError(tok, "all", "strncatUsage", "Dangerous usage of strncat, possible buffer overrun");
+    reportError(tok, "all", "strncatUsage", "Dangerous usage of strncat. Tip: the 3rd parameter means maximum number of characters to append");
 }
 
 void CheckBufferOverrunClass::outOfBounds(const Token *tok, const std::string &what)
@@ -290,7 +290,7 @@ void CheckBufferOverrunClass::checkScope(const Token *tok, const char *varname[]
         if (varid > 0 && Token::Match(tok, "strncat ( %varid% , %any% , %num% )", varid))
         {
             int n = atoi(tok->strAt(6));
-            if (n == size)
+            if (n >= (size - 1))
                 strncatUsage(tok);
         }
 
diff --git a/test/testbufferoverrun.cpp b/test/testbufferoverrun.cpp
index 6cced3eb9..e3988eca2 100644
--- a/test/testbufferoverrun.cpp
+++ b/test/testbufferoverrun.cpp
@@ -555,7 +555,7 @@ private:
               "    strncpy(str, a, 10);\n"
               "    strncat(str, b, 10);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:5]: (all) Dangerous usage of strncat, possible buffer overrun\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5]: (all) Dangerous usage of strncat. Tip: the 3rd parameter means maximum number of characters to append\n", errout.str());
     }
 
     void strncat2()
@@ -565,7 +565,7 @@ private:
               "    char str[5];\n"
               "    strncat(str, a, 5);\n"
               "}\n");
-        ASSERT_EQUALS("[test.cpp:4]: (all) Dangerous usage of strncat, possible buffer overrun\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:4]: (all) Dangerous usage of strncat. Tip: the 3rd parameter means maximum number of characters to append\n", errout.str());
     }