diff --git a/ChangeLog b/ChangeLog
index 4aaea12a48d8ed91516b65b4054fcb5ff7948f5a..a81e5d1a8f3b7cb3a55c37ab3b065e787fae5ba7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -74,6 +74,8 @@ CVS code -
 - rcfile.c:
 	- NUM_RCOPTS fix (DLR).
 	- Add tabsize support to rc file (Nathan Heagy).
+	- Fix incorrect argument in fill and tabsize error message
+	  (Nathan Heagy)
 - search.c:
 	- Changed search prompt to "Search" followed by a list of
 	  bracketed, free-standing modifiers that do not imply a grammar,
diff --git a/rcfile.c b/rcfile.c
index 622760ac874a6e0e3bb346e01e055b166c604c8e..aafa931055a26cc94f835a3a7803be327c3e0d37 100644
--- a/rcfile.c
+++ b/rcfile.c
@@ -194,7 +194,7 @@ void parse_rcfile(FILE *rcstream, char *filename)
 				if ((i = atoi(option)) < MIN_FILL_LENGTH) {
 	    		 	    rcfile_msg(&errors, 
 		_("Error in %s on line %d: requested fill size %d too small"),
-						filename, lineno, option);
+						filename, lineno, i);
 				}
 				else
 				     fill = i;
@@ -203,7 +203,7 @@ void parse_rcfile(FILE *rcstream, char *filename)
 			    	if ((i = atoi(option)) <= 0) {
 			    		rcfile_msg(&errors,
 			    			_("Error in %s on line %d: requested tab size %d too small"),
-			    				filename, lineno, option);
+			    				filename, lineno, i);
 			    	} else {
 			    		tabsize = i;
 			    	}