diff --git a/.gitignore b/.gitignore
index d045c8b67..c577e153d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,10 @@
 /tools
 /build
 /3rdparty
+
+# Ignore user config
+config
+
 
 # Exclude temporary and system files
 Thumbs.db
diff --git a/Makefile b/Makefile
index c3667097f..4df97505a 100644
--- a/Makefile
+++ b/Makefile
@@ -140,6 +140,9 @@ else ifeq ($(UNAME), Windows)
     UAVOBJGENERATOR = $(BUILD_DIR)/uavobjgenerator/uavobjgenerator.exe
 endif
 
+CONFIG_FILE := config
+-include $(CONFIG_FILE)
+
 ##############################
 #
 # All targets