diff --git a/src/redis.c b/src/redis.c
index 393b4225..61d98803 100644
--- a/src/redis.c
+++ b/src/redis.c
@@ -2466,8 +2466,10 @@ void commandCommand(redisClient *c) {
         for (i = 2; i < c->argc; i++) {
             addReplyCommand(c, dictFetchValue(server.commands, c->argv[i]->ptr));
         }
+    } else if (!strcasecmp(c->argv[1]->ptr, "count") && c->argc == 2) {
+        addReplyLongLong(c, dictSize(server.commands));
     } else {
-        addReplyError(c, "Unknown subcommand.");
+        addReplyError(c, "Unknown subcommand or wrong number of arguments.");
         return;
     }
 }