diff --git a/gettext.h b/gettext.h
index 823e4f92..bf56620b 100644
--- a/gettext.h
+++ b/gettext.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    gettext.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/action.c b/openbox/action.c
index a0be04de..fa6e3cc2 100644
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    action.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/action.h b/openbox/action.h
index cf51d415..bbd59804 100644
--- a/openbox/action.h
+++ b/openbox/action.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    action.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/client.c b/openbox/client.c
index 3e10554b..e77ad7b8 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    client.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/client.h b/openbox/client.h
index e1e8d290..69b09d5e 100644
--- a/openbox/client.h
+++ b/openbox/client.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    client.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c
index 97278079..4011c429 100644
--- a/openbox/client_list_menu.c
+++ b/openbox/client_list_menu.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    client_list_menu.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/client_list_menu.h b/openbox/client_list_menu.h
index 874e4339..bcd7729b 100644
--- a/openbox/client_list_menu.h
+++ b/openbox/client_list_menu.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    client_list_menu.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/client_menu.c b/openbox/client_menu.c
index 1e7d5edc..3477702a 100644
--- a/openbox/client_menu.c
+++ b/openbox/client_menu.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    client_menu.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/client_menu.h b/openbox/client_menu.h
index defc8bd1..caf0f054 100644
--- a/openbox/client_menu.h
+++ b/openbox/client_menu.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    client_menu.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/config.c b/openbox/config.c
index 0e199546..7cffcd57 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    config.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/config.h b/openbox/config.h
index 0e7a6a24..4e687395 100644
--- a/openbox/config.h
+++ b/openbox/config.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    config.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/debug.c b/openbox/debug.c
index 45ee97a8..b7f8e1f4 100644
--- a/openbox/debug.c
+++ b/openbox/debug.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    debug.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/debug.h b/openbox/debug.h
index 9ebc3bf3..72a95fdf 100644
--- a/openbox/debug.h
+++ b/openbox/debug.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    debug.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/dock.c b/openbox/dock.c
index a5d85fa7..f1492240 100644
--- a/openbox/dock.c
+++ b/openbox/dock.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    dock.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/dock.h b/openbox/dock.h
index c4ce49cc..b2ded2d2 100644
--- a/openbox/dock.h
+++ b/openbox/dock.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    dock.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/event.c b/openbox/event.c
index 8093965e..051e29c0 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    event.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/event.h b/openbox/event.h
index ea00732a..d0eeeb21 100644
--- a/openbox/event.h
+++ b/openbox/event.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    event.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/extensions.c b/openbox/extensions.c
index 35c5d27e..d6fa1c1d 100644
--- a/openbox/extensions.c
+++ b/openbox/extensions.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    extensions.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/extensions.h b/openbox/extensions.h
index 2d938e22..cc13ecb9 100644
--- a/openbox/extensions.h
+++ b/openbox/extensions.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    extensions.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/focus.c b/openbox/focus.c
index 6ca589b1..36ccbea3 100644
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    focus.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/focus.h b/openbox/focus.h
index e6606dd5..7c67f6cb 100644
--- a/openbox/focus.h
+++ b/openbox/focus.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    focus.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/frame.c b/openbox/frame.c
index bb4440f3..fda6c86b 100644
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    frame.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/frame.h b/openbox/frame.h
index b49bf38f..f5dd5708 100644
--- a/openbox/frame.h
+++ b/openbox/frame.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    frame.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/framerender.c b/openbox/framerender.c
index 17206c10..093260fb 100644
--- a/openbox/framerender.c
+++ b/openbox/framerender.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    framerender.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/framerender.h b/openbox/framerender.h
index 96f088af..a039115e 100644
--- a/openbox/framerender.h
+++ b/openbox/framerender.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    framerender.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/geom.h b/openbox/geom.h
index 6553b74e..c992b4c0 100644
--- a/openbox/geom.h
+++ b/openbox/geom.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    geom.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/grab.c b/openbox/grab.c
index f42ea673..de2efd9a 100644
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    grab.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/grab.h b/openbox/grab.h
index 2988fc5c..5803463a 100644
--- a/openbox/grab.h
+++ b/openbox/grab.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    grab.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/group.c b/openbox/group.c
index d9c1a04b..937ebfd7 100644
--- a/openbox/group.c
+++ b/openbox/group.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    group.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/group.h b/openbox/group.h
index cd17a1f4..d9c2604a 100644
--- a/openbox/group.h
+++ b/openbox/group.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    group.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index e425c6a4..8786cd2c 100644
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    keyboard.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/keyboard.h b/openbox/keyboard.h
index 9c293348..95181065 100644
--- a/openbox/keyboard.h
+++ b/openbox/keyboard.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    keyboard.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/keytree.c b/openbox/keytree.c
index 9b1403f4..960b0506 100644
--- a/openbox/keytree.c
+++ b/openbox/keytree.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    keytree.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/keytree.h b/openbox/keytree.h
index 1331a9b5..f59ef137 100644
--- a/openbox/keytree.h
+++ b/openbox/keytree.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    keytree.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/mainloop.c b/openbox/mainloop.c
index e8af6098..b8b7e698 100644
--- a/openbox/mainloop.c
+++ b/openbox/mainloop.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    mainloop.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/mainloop.h b/openbox/mainloop.h
index c9c5e19e..b04ead50 100644
--- a/openbox/mainloop.h
+++ b/openbox/mainloop.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    mainloop.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/menu.c b/openbox/menu.c
index 3a0cb12a..e1a2e6d8 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    menu.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/menu.h b/openbox/menu.h
index 61e19fe7..781280ca 100644
--- a/openbox/menu.h
+++ b/openbox/menu.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    menu.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index 5184f835..87b269f8 100644
--- a/openbox/menuframe.c
+++ b/openbox/menuframe.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    menuframe.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/menuframe.h b/openbox/menuframe.h
index 5404c265..f2aa9a00 100644
--- a/openbox/menuframe.h
+++ b/openbox/menuframe.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    menuframe.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/misc.h b/openbox/misc.h
index 1971bc85..c79af595 100644
--- a/openbox/misc.h
+++ b/openbox/misc.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    misc.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/mouse.c b/openbox/mouse.c
index 11d73c16..251251b7 100644
--- a/openbox/mouse.c
+++ b/openbox/mouse.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    mouse.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/mouse.h b/openbox/mouse.h
index edd436e7..f4504347 100644
--- a/openbox/mouse.h
+++ b/openbox/mouse.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    mouse.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index ba10af4b..74419175 100644
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    moveresize.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/moveresize.h b/openbox/moveresize.h
index c56da27f..20980cf8 100644
--- a/openbox/moveresize.h
+++ b/openbox/moveresize.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    moveresize.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/mwm.h b/openbox/mwm.h
index eadf2235..b4c8ccbd 100644
--- a/openbox/mwm.h
+++ b/openbox/mwm.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    mwm.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/openbox.c b/openbox/openbox.c
index 3ad19866..84b9fbeb 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    openbox.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/openbox.h b/openbox/openbox.h
index 28cb6e0f..649b6108 100644
--- a/openbox/openbox.h
+++ b/openbox/openbox.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    openbox.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/place.c b/openbox/place.c
index 14ae6ebc..6077b3ed 100644
--- a/openbox/place.c
+++ b/openbox/place.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    place.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/place.h b/openbox/place.h
index 818dacbc..02372320 100644
--- a/openbox/place.h
+++ b/openbox/place.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    place.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/popup.c b/openbox/popup.c
index 45e75fd7..3844089c 100644
--- a/openbox/popup.c
+++ b/openbox/popup.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    popup.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/popup.h b/openbox/popup.h
index 1ffcc61f..82f45c96 100644
--- a/openbox/popup.h
+++ b/openbox/popup.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    popup.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/prop.c b/openbox/prop.c
index 31e12eac..827ab4e9 100644
--- a/openbox/prop.c
+++ b/openbox/prop.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    prop.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/prop.h b/openbox/prop.h
index 01ca939a..00649acc 100644
--- a/openbox/prop.h
+++ b/openbox/prop.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    prop.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/resist.c b/openbox/resist.c
index 1f0fc074..b1e04cca 100644
--- a/openbox/resist.c
+++ b/openbox/resist.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    resist.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/resist.h b/openbox/resist.h
index d21c5096..39108550 100644
--- a/openbox/resist.h
+++ b/openbox/resist.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    resist.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/screen.c b/openbox/screen.c
index efab8ddb..9ce25dde 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    screen.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/screen.h b/openbox/screen.h
index 4a37bf6a..2fd1108c 100644
--- a/openbox/screen.h
+++ b/openbox/screen.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    screen.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/session.c b/openbox/session.c
index 1a051eb1..096e73e9 100644
--- a/openbox/session.c
+++ b/openbox/session.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    session.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/session.h b/openbox/session.h
index 28b2933c..41ba67b4 100644
--- a/openbox/session.h
+++ b/openbox/session.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    session.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/stacking.c b/openbox/stacking.c
index 45ff8370..a496ae45 100644
--- a/openbox/stacking.c
+++ b/openbox/stacking.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    stacking.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/stacking.h b/openbox/stacking.h
index 2ad3677d..2d33873a 100644
--- a/openbox/stacking.h
+++ b/openbox/stacking.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    stacking.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/startupnotify.c b/openbox/startupnotify.c
index 3a339506..f296c76d 100644
--- a/openbox/startupnotify.c
+++ b/openbox/startupnotify.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    startupnotify.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/startupnotify.h b/openbox/startupnotify.h
index bbcd82f3..5d305afd 100644
--- a/openbox/startupnotify.h
+++ b/openbox/startupnotify.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    startupnotify.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/translate.c b/openbox/translate.c
index 593571ce..9ae4f431 100644
--- a/openbox/translate.c
+++ b/openbox/translate.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    translate.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/translate.h b/openbox/translate.h
index 3be3483f..8c54d06a 100644
--- a/openbox/translate.h
+++ b/openbox/translate.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    translate.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/window.c b/openbox/window.c
index 99e20081..894401a1 100644
--- a/openbox/window.c
+++ b/openbox/window.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    window.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/window.h b/openbox/window.h
index 39e81ac7..87af1fc5 100644
--- a/openbox/window.h
+++ b/openbox/window.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    window.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/xerror.c b/openbox/xerror.c
index 16dd5035..a6066e2f 100644
--- a/openbox/xerror.c
+++ b/openbox/xerror.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    xerror.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/openbox/xerror.h b/openbox/xerror.h
index 1019c2a3..c9c902cd 100644
--- a/openbox/xerror.h
+++ b/openbox/xerror.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    xerror.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/parser/parse.c b/parser/parse.c
index 510320b6..0bd77797 100644
--- a/parser/parse.c
+++ b/parser/parse.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    parse.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/parser/parse.h b/parser/parse.h
index e943e1ff..5974b780 100644
--- a/parser/parse.h
+++ b/parser/parse.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    parse.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/render/color.c b/render/color.c
index 554f7414..cd42758b 100644
--- a/render/color.c
+++ b/render/color.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    color.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/render/color.h b/render/color.h
index 7604f565..ed689815 100644
--- a/render/color.h
+++ b/render/color.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    color.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/render/font.c b/render/font.c
index c3d49504..155b373f 100644
--- a/render/font.c
+++ b/render/font.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    font.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/render/font.h b/render/font.h
index 51acd216..ab52b450 100644
--- a/render/font.h
+++ b/render/font.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    font.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/render/geom.h b/render/geom.h
index 83cbeac9..dcf06ea5 100644
--- a/render/geom.h
+++ b/render/geom.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    geom.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/render/gradient.c b/render/gradient.c
index 97c7db18..fa54fbb2 100644
--- a/render/gradient.c
+++ b/render/gradient.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    gradient.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/render/gradient.h b/render/gradient.h
index d0967eec..875f5e17 100644
--- a/render/gradient.h
+++ b/render/gradient.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    gradient.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/render/icon.h b/render/icon.h
index 7551f5a2..7d0626e2 100644
--- a/render/icon.h
+++ b/render/icon.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    icon.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/render/image.c b/render/image.c
index 1c79d694..09d94f17 100644
--- a/render/image.c
+++ b/render/image.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    image.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/render/image.h b/render/image.h
index 8bee333b..c373ce09 100644
--- a/render/image.h
+++ b/render/image.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    image.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/render/instance.c b/render/instance.c
index 0095ed8e..4ce1c3df 100644
--- a/render/instance.c
+++ b/render/instance.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    instance.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/render/instance.h b/render/instance.h
index 9bf85207..21bd535f 100644
--- a/render/instance.h
+++ b/render/instance.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    instance.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/render/mask.c b/render/mask.c
index c883a5e3..3144aff4 100644
--- a/render/mask.c
+++ b/render/mask.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    mask.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/render/mask.h b/render/mask.h
index d4e54f34..e6a158fa 100644
--- a/render/mask.h
+++ b/render/mask.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    mask.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/render/render.c b/render/render.c
index 5a7f0c9a..3fb4965b 100644
--- a/render/render.c
+++ b/render/render.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    render.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/render/render.h b/render/render.h
index c90c8582..e29e74c1 100644
--- a/render/render.h
+++ b/render/render.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    render.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/render/test.c b/render/test.c
index 52221c4d..2c5d75e8 100644
--- a/render/test.c
+++ b/render/test.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    test.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/render/theme.c b/render/theme.c
index 76289a78..75f7cff1 100644
--- a/render/theme.c
+++ b/render/theme.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    theme.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/render/theme.h b/render/theme.h
index 64201c70..651f09e7 100644
--- a/render/theme.h
+++ b/render/theme.h
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    theme.h for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/tests/aspect.c b/tests/aspect.c
index 53a86359..04ea28f2 100644
--- a/tests/aspect.c
+++ b/tests/aspect.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    aspect.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/tests/fullscreen.c b/tests/fullscreen.c
index 74ef0260..937f016f 100644
--- a/tests/fullscreen.c
+++ b/tests/fullscreen.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    fullscreen.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/tests/grav.c b/tests/grav.c
index 02aab1ee..9146d7df 100644
--- a/tests/grav.c
+++ b/tests/grav.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    grav.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/tests/icons.c b/tests/icons.c
index 1d8be03e..6e0e0b6d 100644
--- a/tests/icons.c
+++ b/tests/icons.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    icons.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/tests/modal.c b/tests/modal.c
index 27f12871..f474caf2 100644
--- a/tests/modal.c
+++ b/tests/modal.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    modal.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/tests/modal2.c b/tests/modal2.c
index 757e279e..f7f7c695 100644
--- a/tests/modal2.c
+++ b/tests/modal2.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    modal2.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/tests/modal3.c b/tests/modal3.c
index 8554e0ef..0ea11a3f 100644
--- a/tests/modal3.c
+++ b/tests/modal3.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    modal3.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/tests/noresize.c b/tests/noresize.c
index 1ba4fd52..4d8fd471 100644
--- a/tests/noresize.c
+++ b/tests/noresize.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    noresize.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/tests/override.c b/tests/override.c
index c1605655..042aa0f1 100644
--- a/tests/override.c
+++ b/tests/override.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    override.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/tests/urgent.c b/tests/urgent.c
index 4da717f1..823fa765 100644
--- a/tests/urgent.c
+++ b/tests/urgent.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    urgent.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens
diff --git a/tools/kdetrayproxy/kdetrayproxy.c b/tools/kdetrayproxy/kdetrayproxy.c
index 71aeca8b..f276bf89 100644
--- a/tools/kdetrayproxy/kdetrayproxy.c
+++ b/tools/kdetrayproxy/kdetrayproxy.c
@@ -1,4 +1,4 @@
-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    kdetrayproxy.c for the Openbox window manager
    Copyright (c) 2003        Ben Jansens