diff --git a/comedi_calibrate/Makefile b/comedi_calibrate/Makefile
index b9fc786..4ec6ff5 100644
--- a/comedi_calibrate/Makefile
+++ b/comedi_calibrate/Makefile
@@ -1,8 +1,9 @@
 
+include ../Config
+
 
-
-CFLAGS =-I ../include -I . -O2 -Wall -Wstrict-prototypes
-LDFLAGS=-L../lib/ -lcomedi -lm
+CFLAGS += -I../include
+LDFLAGS += -L../lib/ -lcomedi -lm
 
 
 BINS=comedi_calibrate
diff --git a/comedi_config/Makefile b/comedi_config/Makefile
index 3ac75f6..2859b50 100644
--- a/comedi_config/Makefile
+++ b/comedi_config/Makefile
@@ -1,7 +1,8 @@
 
-CFLAGS=-Wall -Wstrict-prototypes -O2 -I../include
-#LDFLAGS=-L../lib/ -lcomedi
-LDFLAGS=
+include ../Config
+
+CFLAGS += -I../include
+LDFLAGS +=
 
 OBJS=comedi_config.o