diff --git a/commands/simple/mkfs.c b/commands/simple/mkfs.c
index efcf3abe3..c6ee19719 100755
--- a/commands/simple/mkfs.c
+++ b/commands/simple/mkfs.c
@@ -33,6 +33,8 @@
 #include <tools.h>
 #include <dirent.h>
 
+#define MAX_INODES (2*1024*1024)
+
 #undef EXTERN
 #define EXTERN			/* get rid of EXTERN by making it null */
 #include "../../servers/mfs/super.h"
@@ -317,6 +319,11 @@ char *argv[];
 	simple = 1;
   }
 
+  if(inodes > MAX_INODES) {
+	inodes = MAX_INODES;
+	fprintf(stderr, "capping no. of inodes to %lu.\n", inodes);
+  }
+
   nrblocks = blocks;
   nrinodes = inodes;