diff --git a/hkd.c b/hkd.c
index 7c5d54d..d4ddee6 100644
--- a/hkd.c
+++ b/hkd.c
@@ -753,7 +753,7 @@ void parse_config_file (void)
 					bb++;
 				// get state
 				switch (*bb) {
-				case EOF:
+				case (int)EOF:
 				case '\0':
 					// If it is the end of the last block exit
 					if (exit_state > 1)
diff --git a/makefile b/makefile
index 8b57bd8..08fb348 100644
--- a/makefile
+++ b/makefile
@@ -1,4 +1,4 @@
-CC = gcc
+CC ?= gcc
 CFLAGS = -Wall -Werror -pedantic --std=c99 -O2
 VERSION = 0.3
 PREFIX = /usr/local