diff --git a/ChangeLog b/ChangeLog
index 65360dc27420247cea316854c4b3796237c5a5bf..af7ec042c9c28641cc95b22581693fd2d36a272f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,8 @@ General
 	  Neil Parks).
   do_browser()
 	- Added space and - keys to do page up and down.
+  cwd_tab_completion(), input_tab()
+	- Changed bare malloc/calloc calls to nmalloc (found by Rocco).
 - nano.c:
   ABCD()
 	- New function, figures out what kbinput to return given
diff --git a/files.c b/files.c
index 01d9ff1a5bed8bddcec46dac65cf7c9b012831fb..ebb0acdaf56688fa8a5ac67bc9aac994a37e2db6 100644
--- a/files.c
+++ b/files.c
@@ -796,7 +796,7 @@ char **cwd_tab_completion(char *buf, int *num_matches)
 
     /* Okie, if there's a / in the buffer, strip out the directory part */
     if (strcmp(buf, "") && strstr(buf, "/")) {
-	dirName = malloc(strlen(buf) + 1);
+	dirName = nmalloc(strlen(buf) + 1);
 	tmp = buf + strlen(buf);
 	while (*tmp != '/' && tmp != buf)
 	    tmp--;
@@ -882,7 +882,7 @@ char *input_tab(char *buf, int place, int *lastWasTab, int *newplace)
 
 	/* Make a local copy of the string -- up to the position of the
 	   cursor */
-	matchBuf = (char *) calloc(strlen(buf) + 2, sizeof(char));
+	matchBuf = (char *) nmalloc((strlen(buf) + 2) * sizeof(char));
 
 	strncpy(matchBuf, buf, place);
 	tmp = matchBuf;