--- a/Makefile
+++ b/Makefile
@@ -10,21 +10,23 @@
 FULL_VERSION    := $(VERSION)
 endif
 
-AUGEAS_LIBS= $(shell pkg-config --libs augeas)
+#AUGEAS_LIBS= $(shell pkg-config --libs augeas)
 OBJS = laugeas.o
-LIBS = $(AUGEAS_LIBS)
+#LIBS = $(AUGEAS_LIBS)
 
-CFLAGS ?= -g -Wall -Werror
+
+CFLAGS += -g -Wall -Werror
 CFLAGS += -fPIC
 CFLAGS += -DVERSION=\"$(FULL_VERSION)\"
+CFLAGS += $(shell pkg-config augeas --cflags) $(shell pkg-config lua5.1 --cflags)
 
-LDFLAGS += -L/lib
+LDFLAGS += $(shell pkg-config augeas --libs) $(shell pkg-config lua5.1 --libs)
 
 all:	augeas.so
 
 
 augeas.so: $(OBJS)
-	$(CC) $(LDFLAGS) -o $@  -fPIC -shared $^ $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@  -fPIC -shared $^ $(LIBS)
 
 clean:
 	rm -f augeas.so $(OBJS)