diff --git a/awesome-client.1.txt b/awesome-client.1.txt
index bc051549..250da80d 100644
--- a/awesome-client.1.txt
+++ b/awesome-client.1.txt
@@ -31,11 +31,11 @@ The command format is:
 For example, to change statusbar text on screen 0, you can do the following:
 
     echo 0 widget_tell <widget-id> Hello, world | awesome-client
- 
+
 To view tag number 3 on screen 1:
 
     echo 1 tag_view 3 | awesome-client
- 
+
 To zoom focused window on screen 0:
 
     echo 0 client_zoom | awesome-client
diff --git a/awesome.c b/awesome.c
index 82146772..4981494a 100644
--- a/awesome.c
+++ b/awesome.c
@@ -374,7 +374,7 @@ main(int argc, char *argv[])
     /* refresh everything before waiting events */
     statusbar_refresh();
     layout_refresh();
-    
+
     /* main event loop, also reads status text from socket */
     while(running)
     {
@@ -419,7 +419,7 @@ main(int argc, char *argv[])
                 XNextEvent(dpy, &ev);
                 if(handler[ev.type])
                     handler[ev.type](&ev);
-    
+
                 /* drop events requested to */
                 if(globalconf.drop_events)
                 {
@@ -428,14 +428,14 @@ main(int argc, char *argv[])
                     while(XCheckMaskEvent(dpy, globalconf.drop_events, &ev));
                     globalconf.drop_events = NoEventMask;
                 }
-    
+
                 /* need to resync */
                 XSync(dpy, False);
             }
-    
+
             statusbar_refresh();
             layout_refresh();
-    
+
             /* need to resync */
             XSync(dpy, False);
         }
diff --git a/client.c b/client.c
index 4b9d0fb8..6e5f5929 100644
--- a/client.c
+++ b/client.c
@@ -401,7 +401,7 @@ client_manage(Window w, XWindowAttributes *wa, int screen)
 
     if(!(flags & (USPosition | PPosition)))
         c->f_geometry = client_get_smart_geometry(c->f_geometry, c->border, c->screen);
-    
+
     XSelectInput(globalconf.display, w, StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
 
     /* handle xshape */
@@ -437,7 +437,7 @@ client_manage(Window w, XWindowAttributes *wa, int screen)
     /* some windows require this */
     XMoveResizeWindow(globalconf.display, c->win, c->geometry.x, c->geometry.y,
                       c->geometry.width, c->geometry.height);
- 
+
     widget_invalidate_cache(c->screen, WIDGET_CACHE_CLIENTS);
     ewmh_update_net_client_list(phys_screen);
 }
@@ -942,7 +942,7 @@ uicb_client_kill(int screen __attribute__ ((unused)), char *arg __attribute__ ((
 static void
 client_maximize(Client *c, Area geometry)
 {
-    
+
     if((c->ismax = !c->ismax))
     {
         c->wasfloating = c->isfloating;
diff --git a/client.h b/client.h
index 10d7ca1c..f0928619 100644
--- a/client.h
+++ b/client.h
@@ -36,7 +36,7 @@ void client_unmanage(Client *);
 void client_updatewmhints(Client *);
 long client_updatesizehints(Client *);
 void client_updatetitle(Client *);
-void client_saveprops(Client *); 
+void client_saveprops(Client *);
 void client_kill(Client *);
 void client_setfloating(Client *, Bool);
 
@@ -45,9 +45,9 @@ Uicb uicb_client_moveresize;
 Uicb uicb_client_settrans;
 Uicb uicb_client_swapnext;
 Uicb uicb_client_swapprev;
-Uicb uicb_client_togglemax; 
-Uicb uicb_client_toggleverticalmax; 
-Uicb uicb_client_togglehorizontalmax; 
+Uicb uicb_client_togglemax;
+Uicb uicb_client_toggleverticalmax;
+Uicb uicb_client_togglehorizontalmax;
 Uicb uicb_client_zoom;
 Uicb uicb_client_focusnext;
 Uicb uicb_client_focusprev;
diff --git a/common/list.h b/common/list.h
index bde59d34..157aeb37 100644
--- a/common/list.h
+++ b/common/list.h
@@ -133,6 +133,6 @@
             *list = item->next;                                              \
         item->next = NULL;                                                   \
     }                                                                        \
- 
+
 #endif
 // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/config.c b/config.c
index a695bde0..150233b5 100644
--- a/config.c
+++ b/config.c
@@ -113,7 +113,7 @@ mouse_button_lookup(const char *button)
         {NULL, 0}
     };
     int i;
-    
+
     if(button)
         for(i = 0; MouseButtonList[i].name; i++)
             if(!a_strcmp(button, MouseButtonList[i].name))
diff --git a/ewmh.c b/ewmh.c
index 5402cd98..ac267258 100644
--- a/ewmh.c
+++ b/ewmh.c
@@ -88,7 +88,7 @@ static AtomItem AtomNames[] =
     { "UTF8_STRING", &utf8_string },
 };
 
-#define ATOM_NUMBER (sizeof(AtomNames)/sizeof(AtomItem)) 
+#define ATOM_NUMBER (sizeof(AtomNames)/sizeof(AtomItem))
 
 #define _NET_WM_STATE_REMOVE 0
 #define _NET_WM_STATE_ADD 1
@@ -100,7 +100,7 @@ ewmh_init_atoms(void)
     unsigned int i;
     char *names[ATOM_NUMBER];
     Atom atoms[ATOM_NUMBER];
-    
+
     for(i = 0; i < ATOM_NUMBER; i++)
         names[i] = (char *) AtomNames[i].name;
     XInternAtoms(globalconf.display, names, ATOM_NUMBER, False, atoms);
@@ -122,7 +122,7 @@ ewmh_set_supported_hints(int phys_screen)
     atom[i++] = net_active_window;
 
     atom[i++] = net_close_window;
-    
+
     atom[i++] = net_wm_name;
     atom[i++] = net_wm_icon_name;
     atom[i++] = net_wm_window_type;
@@ -189,7 +189,7 @@ ewmh_update_net_current_desktop(int phys_screen)
 
     XChangeProperty(globalconf.display, RootWindow(globalconf.display, phys_screen),
                     net_current_desktop, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &count, 1);
-    
+
     p_delete(&curtags);
 }
 
diff --git a/focus.c b/focus.c
index ff289dc7..8c6a4058 100644
--- a/focus.c
+++ b/focus.c
@@ -20,7 +20,7 @@
  */
 
 #include "tag.h"
-#include "focus.h" 
+#include "focus.h"
 #include "client.h"
 
 extern AwesomeConf globalconf;
diff --git a/rules.c b/rules.c
index 5cd5305d..2085978d 100644
--- a/rules.c
+++ b/rules.c
@@ -74,7 +74,7 @@ client_match_rule(Client *c, Rule *r)
         if(ret)
             return True;
     }
-    
+
     if(r->xprop
        && r->xpropval_r
        && xgettextprop(c->win,
diff --git a/rules.h b/rules.h
index 2a629350..3640d98f 100644
--- a/rules.h
+++ b/rules.h
@@ -26,7 +26,7 @@
 
 #define RULE_NOSCREEN        -1
 
-regex_t * rules_compile_regex(char *);    
+regex_t * rules_compile_regex(char *);
 Bool tag_match_rule(Tag *, Rule *);
 Fuzzy rules_get_fuzzy_from_str(const char *);
 Rule * rule_matching_client(Client *);
diff --git a/statusbar.c b/statusbar.c
index 5b51df97..cc57369e 100644
--- a/statusbar.c
+++ b/statusbar.c
@@ -188,7 +188,7 @@ statusbar_init(Statusbar *statusbar)
                                 globalconf.screens[statusbar->screen].statusbar,
                                 &globalconf.screens[statusbar->screen].padding);
 
-    
+
     /* Top and Bottom Statusbar have prio */
     for(sb = globalconf.screens[statusbar->screen].statusbar; sb; sb = sb->next)
         switch(sb->position)
@@ -253,7 +253,7 @@ statusbar_refresh()
 Position
 statusbar_get_position_from_str(const char *pos)
 {
-    if(!a_strncmp(pos, "off", 3)) 
+    if(!a_strncmp(pos, "off", 3))
         return Off;
     else if(!a_strncmp(pos, "bottom", 6))
         return Bottom;
diff --git a/widget.c b/widget.c
index 2b6ebbe7..c36af93e 100644
--- a/widget.c
+++ b/widget.c
@@ -63,7 +63,7 @@ widget_find(char *name, int screen)
 {
     Widget *widget;
     Statusbar *sb;
-    
+
     for(sb = globalconf.screens[screen].statusbar; sb; sb = sb->next)
         for(widget = sb->widgets; widget; widget = widget->next)
             if(a_strcmp(name, widget->name) == 0)
diff --git a/widgets/focusicon.c b/widgets/focusicon.c
index 0c7599d6..fbdd7285 100644
--- a/widgets/focusicon.c
+++ b/widgets/focusicon.c
@@ -101,7 +101,7 @@ focusicon_new(Statusbar *statusbar, cfg_t *config)
     widget_common_new(w, statusbar, config);
     w->draw = focusicon_draw;
     w->alignment = draw_get_align(cfg_getstr(config, "align"));
-    
+
     /* Set cache property */
     w->cache.flags = WIDGET_CACHE_CLIENTS;
 
diff --git a/widgets/iconbox.c b/widgets/iconbox.c
index 9b9d2428..7c999bad 100644
--- a/widgets/iconbox.c
+++ b/widgets/iconbox.c
@@ -87,7 +87,7 @@ iconbox_new(Statusbar *statusbar, cfg_t *config)
     w->data = d = p_new(Data, 1);
     d->image = a_strdup(cfg_getstr(config, "image"));
     d->resize = cfg_getbool(config, "resize");
-    
+
     return w;
 }
 // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/widgets/tasklist.c b/widgets/tasklist.c
index bf228074..3121b6e2 100644
--- a/widgets/tasklist.c
+++ b/widgets/tasklist.c
@@ -91,7 +91,7 @@ tasklist_draw(Widget *widget, DrawCtx *ctx, int offset, int used)
     for(c = globalconf.clients; c; c = c->next)
         if(tasklist_isvisible(c, widget->statusbar->screen, d->show))
             n++;
-    
+
     if(!n)
         return (widget->area.width = 0);
 
@@ -208,7 +208,7 @@ tasklist_button_press(Widget *widget, XButtonPressedEvent *ev)
         for(c = globalconf.clients; c; c = c->next)
             if(tasklist_isvisible(c, widget->statusbar->screen, d->show))
                 n++;
-    
+
         if(!n)
             return;
 
diff --git a/window.c b/window.c
index af290b69..7c909f49 100644
--- a/window.c
+++ b/window.c
@@ -20,7 +20,7 @@
  */
 
 #include <X11/Xatom.h>
-#include <X11/extensions/shape.h> 
+#include <X11/extensions/shape.h>
 
 #include "structs.h"
 #include "window.h"
@@ -115,7 +115,7 @@ window_grabbuttons(int screen, Window win)
         XGrabButton(globalconf.display, b->button, b->mod | globalconf.numlockmask | LockMask,
                     win, False, BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
     }
-    
+
     XUngrabButton(globalconf.display, AnyButton, AnyModifier, RootWindow(globalconf.display, screen));
 }