diff --git a/Makefile b/Makefile
index 9c360ad..2b9b4df 100644
--- a/Makefile
+++ b/Makefile
@@ -3,9 +3,9 @@
 #
 
 CC       = gcc
-CFLAGS   = -O2 -Werror -Ilib
+CFLAGS   = -O2 -Werror -Ilib $(shell getconf LFS_CFLAGS)
 LD		 = $(CC)
-LDFLAGS  = 
+LDFLAGS  = $(shell getconf LFS_LDFLAGS)
 
 FINDOBJ = find . -name "*.o" -type f -printf "%P\n"
 
diff --git a/test/Makefile b/test/Makefile
index 34e7a67..c25c453 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,7 +1,7 @@
 # Test makefile
 CC=gcc
-CFLAGS=-g -D__DEBUG__
-LDFLAGS=-L/usr/lib64/mysql -lmysqlclient
+CFLAGS=-g -D__DEBUG__ $(shell getconf LFS_CFLAGS)
+LDFLAGS=-L/usr/lib64/mysql -lmysqlclient $(shell getconf LFS_LDFLAGS)
 
 all : raw_inotify strbuf path rbtree inotify fscrawl queue