diff --git a/scripts/ntp-info.nse b/scripts/ntp-info.nse
index f7d620261..048faf002 100644
--- a/scripts/ntp-info.nse
+++ b/scripts/ntp-info.nse
@@ -74,9 +74,9 @@ local DEFAULT_FIELDS = {"version", "processor", "system", "refid", "stratum"}
 
 -- comma-space-separated key=value pairs with optional quotes
 local kvmatch = U.localize( {
-    lpeg.V "space"^0 * lpeg.V "kv" * lpeg.P(",")^-1,
-    kv = lpeg.V "key" * "=" * lpeg.V "value",
-    key = lpeg.C( (lpeg.V "alnum" + "_")^1 ),
+    lpeg.V "space"^0 * lpeg.V "kv" * lpeg.P ","^-1,
+    kv = lpeg.V "key" * lpeg.P "="^-1 * lpeg.V "value",
+    key = lpeg.C( (lpeg.V "alnum" + lpeg.S "_-.")^1 ),
     value = U.escaped_quote() + lpeg.C((lpeg.P(1) - ",")^1),
   } )