diff --git a/Makefile.conf b/Makefile.conf
index c69f453..2cfc91e 100644
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -3,18 +3,16 @@
 # This file may be used under the terms of the GNU General Public License version 3
 # see LICENSE.txt
 
-HERE:=$(dir $(lastword $(MAKEFILE_LIST)))
+BUILD_CONF?=./build.conf
+-include $(BUILD_CONF)
 
 TARGET=libpEpAdapter.a
 
 # Build config
 # Defaults
-DEBUG=1
+DEBUG?=debug
 PREFIX?=$(HOME)
 
-# Overrides
--include $(HERE)local.conf
-
 # Constants
 CXXFLAGS+=-std=c++11 -fPIC
 CXXFLAGS+=-Wall -pedantic-errors -Wno-unused-parameter -Wno-reorder-ctor
@@ -30,10 +28,10 @@ else ifneq (,$(findstring clang,$(CXX)))
     CFLAGS+=-fcolor-diagnostics
 endif
 
-ifeq ($(DEBUG),1)
-    CXXFLAGS+=-g -O0
-    CFLAGS+=-g -O0
-else
+ifeq ($(DEBUG),release)
     CXXFLAGS+=-DNDEBUG=1 -O3
     CFLAGS+=-DNDEBUG=1 -O3
+else
+    CXXFLAGS+=-g -O0
+    CFLAGS+=-g -O0
 endif
diff --git a/local.conf.example b/build.conf.example
similarity index 80%
rename from local.conf.example
rename to build.conf.example
index f53ff09..d4530ac 100644
--- a/local.conf.example
+++ b/build.conf.example
@@ -6,8 +6,8 @@
 ######### C++ Compiler #########
 # Should work with clang and g++
 # CXX=g++
-# DEBUG=1       # DEBUG Build (Default)
-# DEBUG=0       # RELEASE Build
+# DEBUG=debug         # DEBUG Build (Default)
+# DEBUG=release       # RELEASE Build
 
 ############# DIRS #############
 # PREFIX=$(HOME)/local