diff --git a/src/Makefile b/src/Makefile
index c65df68..10dea77 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -18,7 +18,7 @@ all: $(TARGETS)
 
 keyboard_OBJS = callbacks.o common.o key.o keyboard.o layout.o main.o
 keyboard_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
-keyboard_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -lXtst
+keyboard_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs x11` -lXtst
 
 keyboard: $(keyboard_OBJS)
 	$(CC) -o keyboard $(keyboard_OBJS) $(keyboard_LDFLAGS)
diff --git a/src/project.conf b/src/project.conf
index 1f71a52..2fe9e0b 100644
--- a/src/project.conf
+++ b/src/project.conf
@@ -8,7 +8,7 @@ dist=Makefile,callbacks.h,common.h,key.h,keyboard.h,layout.h
 [keyboard]
 type=binary
 sources=callbacks.c,common.c,key.c,keyboard.c,layout.c,main.c
-ldflags=-lXtst
+ldflags=`pkg-config --libs x11` -lXtst
 install=$(BINDIR)
 
 [callbacks.c]
diff --git a/tools/Makefile b/tools/Makefile
index ba0a19a..fdcf548 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -32,7 +32,7 @@ snooper: $(snooper_OBJS)
 
 xkey_OBJS = xkey.o
 xkey_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
-xkey_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -lXtst
+xkey_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs x11` -lXtst
 
 xkey: $(xkey_OBJS)
 	$(CC) -o xkey $(xkey_OBJS) $(xkey_LDFLAGS)
diff --git a/tools/project.conf b/tools/project.conf
index c99e344..d990b17 100644
--- a/tools/project.conf
+++ b/tools/project.conf
@@ -15,4 +15,4 @@ sources=snooper.c
 [xkey]
 type=binary
 sources=xkey.c
-ldflags=-lXtst
+ldflags=`pkg-config --libs x11` -lXtst