diff --git a/Makefile b/Makefile
index 6dfb92f88..2fe0d0b1d 100644
--- a/Makefile
+++ b/Makefile
@@ -84,7 +84,10 @@ mk/cc.mk:
 config.h: CONFIG CONFIG.local scripts/genconfig.py
 	$(Q)PYCMD=$$(cat PYTHON_COMMAND 2>/dev/null) ; \
 	test -z "$$PYCMD" && PYCMD=python ; \
-	$$PYCMD scripts/genconfig.py $(MAKEFLAGS) > $@.tmp; \
+	echo "#ifndef SPDK_CONFIG_H" > $@.tmp; \
+	echo "#define SPDK_CONFIG_H" >> $@.tmp; \
+	$$PYCMD scripts/genconfig.py $(MAKEFLAGS) >> $@.tmp; \
+	echo "#endif /* SPDK_CONFIG_H */" >> $@.tmp; \
 	cmp -s $@.tmp $@ || mv $@.tmp $@ ; \
 	rm -f $@.tmp