diff --git a/ChangeLog b/ChangeLog
index 3548f1011..d9f6e7dfa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2009-01-18 Patrick Winnertz <winnie@debian.org
+2009-01-19 Patrick Winnertz <winnie@debian.org>
+
+	* edit/edit.h: Add two more ints
+	* src/setup.c: Add keybinding to disable tab highlighting
+
+2009-01-18 Patrick Winnertz <winnie@debian.org>
 
 	* edit/editdraw.c: Moved var into if clause as it's only used
 	there
diff --git a/edit/edit.h b/edit/edit.h
index 4a1c39b5a..3e5f5637e 100644
--- a/edit/edit.h
+++ b/edit/edit.h
@@ -298,6 +298,9 @@ extern char *option_backup_ext;
 extern int edit_confirm_save;
 extern int column_highlighting;
 
+extern int visible_tabs;
+extern int visible_tws;
+
 /* File names */
 #define EDIT_DIR           ".mc" PATH_SEP_STR "cedit"
 #define SYNTAX_FILE        EDIT_DIR PATH_SEP_STR "Syntax"
diff --git a/src/setup.c b/src/setup.c
index 026ac02d7..f26566a53 100644
--- a/src/setup.c
+++ b/src/setup.c
@@ -216,6 +216,8 @@ static const struct {
     { "editor_option_typewriter_wrap", &option_typewriter_wrap },
     { "editor_edit_confirm_save", &edit_confirm_save },
     { "editor_syntax_highlighting", &option_syntax_highlighting },
+    { "editor_visible_tabs", &visible_tabs },
+    { "editor_visible_spaces", &visible_tws },
 #endif /* USE_INTERNAL_EDIT */
 
     { "nice_rotating_dash", &nice_rotating_dash },