diff --git a/.gitignore b/.gitignore
index 71830c5..949fd62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-Xlambda
\ No newline at end of file
+Xlambda
+*.o
diff --git a/Makefile b/Makefile
index a890c9b..a6eb9ef 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,13 @@
-CC      = cc
-LD      = $(CC)
-OS      = $(shell uname)
-GUILE_VERSION ?= 2.2
-GUILE_INCLUDE = $(OS)
-GUILE_INCLUDE := $(GUILE_INCLUDE:Linux=/usr/include/guile/$(GUILE_VERSION))
-GUILE_INCLUDE := $(GUILE_INCLUDE:$(OS)=/usr/local/include/guile/$(GUILE_VERSION))
+CC ?= cc
+CCLD ?= $(CC)
 
-CFLAGS  = -fPIC -Os
-CFLAGS += -Wall -Wno-unused-function
-CFLAGS += -I$(GUILE_INCLUDE) -I/usr/local/include -pthread
-LDFLAGS = -L/usr/local/lib -pthread -lguile-$(GUILE_VERSION) -lgc
-CFLAGS += -I/usr/X11R6/include
-LDFLAGS += -L/usr/X11R6/lib -lxcb
+CFLAGS += -fPIC -g -Os -Wall -Wno-unused-function `pkg-config --cflags guile-2.2 xcb`
+LDFLAGS += `pkg-config --libs guile-2.2 xcb`
 
+OBJ := Xlambda.o
 
-all:
-	$(CC) $(CFLAGS) $(LDFLAGS) Xlambda.c -o Xlambda
+all: $(OBJ)
+	$(CCLD) $(LDFLAGS) -o Xlambda $(OBJ)
+
+clean:
+	rm -f Xlambda $(OBJ)