diff --git a/ChangeLog b/ChangeLog
index a53705e2..1ea98397 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,8 @@ CVS code
   do_enter()
 	- Fixed typo (?) in check for inptr->next.  Caused lots of
 	  grief for editing lines at filebot.
+  main()
+	- Removed now useless usrtabsize variable (Christian Weisgerber).
 - search.c:
   replace_abort()
 	- redundant, now just calls search abort until it does something
diff --git a/nano.c b/nano.c
index 5e65d618..209e2990 100644
--- a/nano.c
+++ b/nano.c
@@ -1539,7 +1539,6 @@ int main(int argc, char *argv[])
     struct sigaction act;	/* For our lovely signals */
     int keyhandled = 0;		/* Have we handled the keystroke yet? */
     int tmpkey = 0, i;
-    int usrtabsize = 0;		/* User defined tab size */
     char *argv0;
     struct termios term;
 
@@ -1588,8 +1587,8 @@ int main(int argc, char *argv[])
 
 	switch (optchr) {
 	case 'T':
-	    usrtabsize = atoi(optarg);
-	    if (usrtabsize <= 0) {
+	    tabsize = atoi(optarg);
+	    if (tabsize <= 0) {
 		usage();	/* To stop bogus data for tab width */
 		finish(1);
 	    }
@@ -1772,9 +1771,6 @@ int main(int argc, char *argv[])
     else
 	edit_update(fileage, CENTER);
 
-    if (usrtabsize > 0)
-	tabsize = usrtabsize;
-
     edit_refresh();
     reset_cursor();