diff --git a/NEWS b/NEWS
index 437c7476..334fea70 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@
       special versions for the old behavior
     * IMPORTANT: renamed Startup and Quit autocmd events to VimperatorEnter and
       VimperatorLeave respectively
+    * add . mapping
     * add N% normal mode command
     * add interpolation for items such as <url> to autocommands
     * add -nargs, -bang, and -count attribute support to :command
diff --git a/content/buffer.js b/content/buffer.js
index bcef0fbf..cc7a2897 100644
--- a/content/buffer.js
+++ b/content/buffer.js
@@ -469,11 +469,15 @@ liberator.Buffer = function () //{{{
 
     liberator.mappings.add(modes, ["."],
         "Repeat the last key event",
-        function ()
+        function (count)
         {
             if (liberator.mappings.repeat)
-                liberator.mappings.repeat();
-        });
+            {
+                for (let i in liberator.util.range(0, count || 1))
+                    liberator.mappings.repeat();
+            }
+        },
+        { flags: liberator.Mappings.flags.COUNT });
 
     liberator.mappings.add(modes, ["i", "<Insert>"],
         "Start caret mode",
diff --git a/content/completion.js b/content/completion.js
index a042307a..d7e1c762 100644
--- a/content/completion.js
+++ b/content/completion.js
@@ -292,7 +292,7 @@ liberator.Completion = function () //{{{
                     {
                         case "(":
                             /* Function call, or if/while/for/... */
-                            if (/\w$/.test(lastNonwhite))
+                            if (/\w\d$/.test(lastNonwhite))
                             {
                                 top[FUNCTIONS].push(i);
                                 top[STATEMENTS].pop();
diff --git a/locale/en-US/repeat.txt b/locale/en-US/repeat.txt
index b08c1977..6f19c0ea 100644
--- a/locale/en-US/repeat.txt
+++ b/locale/en-US/repeat.txt
@@ -48,6 +48,15 @@ Replay the last executed macro [count] times.
 ____________________________________________________________________________
 
 
+|.|
+||[count].|
+____________________________________________________________________________
+Repeat the last keyboard mapping [count] times. Note that, unlike in vim, this
+does not apply solely to editing commands, mainly because Vimperator doesn't
+have them.
+____________________________________________________________________________
+
+
 section:Using{nbsp}scripts[using-scripts]
 
 |:so| |:source|