diff --git a/Makefile b/Makefile
index ee4bacb..fdd372e 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 
 include config.mk
 
-SRC = draw.c dunst.c dunst_dbus.c utils.c options.c
+SRC = draw.c dunst.c dbus.c utils.c options.c
 OBJ = ${SRC:.c=.o}
 
 all: doc options dunst service
diff --git a/dunst_dbus.c b/dbus.c
similarity index 99%
rename from dunst_dbus.c
rename to dbus.c
index 6b21277..c049368 100644
--- a/dunst_dbus.c
+++ b/dbus.c
@@ -3,7 +3,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 #include "dunst.h"
-#include "dunst_dbus.h"
+#include "dbus.h"
 
 GDBusConnection *dbus_conn;
 
diff --git a/dunst_dbus.h b/dbus.h
similarity index 100%
rename from dunst_dbus.h
rename to dbus.h
diff --git a/dunst.c b/dunst.c
index 9584571..becb5f4 100644
--- a/dunst.c
+++ b/dunst.c
@@ -1,4 +1,4 @@
-/* copyright 2013 Sascha Kruse and contributors (see LICENSE for licensing information) */
+/* copyright 2012 Sascha Kruse and contributors (see LICENSE for licensing information) */
 
 #define _GNU_SOURCE
 #define XLIB_ILLEGAL_ACCESS
@@ -32,12 +32,11 @@
 
 #include "dunst.h"
 #include "draw.h"
-#include "dunst_dbus.h"
+#include "dbus.h"
 #include "utils.h"
 
 #include "options.h"
 
-
 #define INRECT(x,y,rx,ry,rw,rh) ((x) >= (rx) && (x) < (rx)+(rw) && (y) >= (ry) && (y) < (ry)+(rh))
 #define LENGTH(X)               (sizeof X / sizeof X[0])
 #define BUTTONMASK              (ButtonPressMask|ButtonReleaseMask)
@@ -194,6 +193,7 @@ int cmp_notification(const void *va, const void *vb)
 {
         notification *a = (notification*) va;
         notification *b = (notification*) vb;
+
         if (!sort)
                 return 1;