diff --git a/Makefile b/Makefile
index 3731e5f..b34c638 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 
 include config.mk
 
-SRC = draw.c dunst.c dbus.c utils.c options.c settings.c
+SRC = draw.c dunst.c dbus.c utils.c option_parser.c settings.c
 OBJ = ${SRC:.c=.o}
 
 all: doc options dunst service
diff --git a/dunst.c b/dunst.c
index 45184a0..b92d009 100644
--- a/dunst.c
+++ b/dunst.c
@@ -34,7 +34,7 @@
 #include "dbus.h"
 #include "utils.h"
 
-#include "options.h"
+#include "option_parser.h"
 #include "settings.h"
 
 // }}}
diff --git a/options.c b/option_parser.c
similarity index 99%
rename from options.c
rename to option_parser.c
index 228c5ed..23ddae1 100644
--- a/options.c
+++ b/option_parser.c
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <glib.h>
 
-#include "options.h"
+#include "option_parser.h"
 #include "utils.h"
 
 typedef struct _entry_t {
diff --git a/options.h b/option_parser.h
similarity index 100%
rename from options.h
rename to option_parser.h
diff --git a/settings.c b/settings.c
index 3ef359c..e07ff6d 100644
--- a/settings.c
+++ b/settings.c
@@ -5,7 +5,7 @@
 #include <basedir_fs.h>
 
 #include "dunst.h"
-#include "options.h"
+#include "option_parser.h"
 #include "settings.h"
 #include "config.h"
 // }}}