diff --git a/.clang_complete b/.clang_complete
index 121d6a7..f07a5f5 100644
--- a/.clang_complete
+++ b/.clang_complete
@@ -6,7 +6,7 @@
 -I/usr/include/pango-1.0
 -I/usr/include/pixman-1
 -I/usr/lib/dbus-1.0/include
--I/usr/lib/glib-2.0/include 
+-I/usr/lib/glib-2.0/include
 -I/usr/include/cairo
 -I/usr/include/pixman-1
 -I/usr/include/libdrm
diff --git a/Makefile b/Makefile
index 0c3a9f5..3d31830 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ dunst: ${OBJ}
 	@${CC} ${CFLAGS} -o $@ ${OBJ} ${LDFLAGS}
 
 dunstify:
-	@${CC} -o $@ dunstify.c -std=c99 $(shell pkg-config --libs --cflags glib-2.0 libnotify) 
+	@${CC} -o $@ dunstify.c -std=c99 $(shell pkg-config --libs --cflags glib-2.0 libnotify)
 
 debug: ${OBJ}
 	@echo CC -o $@
diff --git a/RELEASE_NOTES.1.0.0 b/RELEASE_NOTES.1.0.0
index 120f3ce..8ddc231 100644
--- a/RELEASE_NOTES.1.0.0
+++ b/RELEASE_NOTES.1.0.0
@@ -52,4 +52,4 @@ PACKAGE MAINTAINERS:
     not exist.
 
     Please don't open bug reports when dunstify doesn't work with your
-    version of libnotify 
+    version of libnotify
diff --git a/settings.c b/settings.c
index 7b22326..e982fcf 100644
--- a/settings.c
+++ b/settings.c
@@ -165,7 +165,7 @@ void load_settings(char *cmdline_config_path)
             option_get_bool("global", "sticky_history", "-sticky_history",
                             sticky_history,
                             "Don't timeout notifications popped up from history");
-        settings.history_length = 
+        settings.history_length =
                 option_get_int("global", "history_length", "-history_length",
                                 history_length,
                                 "Max amount of notifications kept in history");
diff --git a/test/test.sh b/test/test.sh
index c3717a4..7883e1e 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -54,7 +54,7 @@ function ignore_newline {
     killall dunst
     ../dunst -config dunstrc.ignore_newline &
     ../dunstify -a "dunst tester" -u c "Ignore Newline" \
-        "The only newlines you should encounter here are wordwraps. That's why I'm so long." 
+        "The only newlines you should encounter here are wordwraps. That's why I'm so long."
     ../dunstify -a "dunst tester" -u c "Th\nis\n\n\n is\n fu\nll of \n" "\nnew\nlines"
     basic_notifications
     keypress
@@ -136,31 +136,31 @@ function geometry {
 
     killall dunst
     ../dunst -config dunstrc.default -geom "200x0" &
-    ../dunstify -a "dunst tester" -u c "200x0" 
+    ../dunstify -a "dunst tester" -u c "200x0"
     basic_notifications
     keypress
 
     killall dunst
     ../dunst -config dunstrc.default -geom "200x2" &
-    ../dunstify -a "dunst tester" -u c "200x2" 
+    ../dunstify -a "dunst tester" -u c "200x2"
     basic_notifications
     keypress
 
     killall dunst
     ../dunst -config dunstrc.default -geom "200x1" &
-    ../dunstify -a "dunst tester" -u c "200x1" 
+    ../dunstify -a "dunst tester" -u c "200x1"
     basic_notifications
     keypress
 
     killall dunst
     ../dunst -config dunstrc.default -geom "0x1" &
-    ../dunstify -a "dunst tester" -u c "0x1" 
+    ../dunstify -a "dunst tester" -u c "0x1"
     basic_notifications
     keypress
 
     killall dunst
     ../dunst -config dunstrc.default -geom "-300x1" &
-    ../dunstify -a "dunst tester" -u c "-300x1" 
+    ../dunstify -a "dunst tester" -u c "-300x1"
     basic_notifications
     keypress