--- a/Makefile
+++ b/Makefile
@@ -11,14 +11,13 @@
 
 #=========================== C compiler configuration ==========================
 
-CC     = gcc
-CFLAGS = -I/usr/X11R6/include -O2
+CFLAGS += $(shell pkg-config --cflags x11 xext)
 
 #============================= Linker configuration ============================
 
-LINK   = gcc
-LFLAGS = -L/usr/X11R6/lib
-LIBS   = -lm -lX11 -lXext
+LINK   = $(CC)
+LFLAGS = $(LDFLAGS)
+LIBS   = -lm $(shell pkg-config --libs x11 xext)
 
 #============================ Installer configuration ==========================
 
--- a/xdwapi/Makefile
+++ b/xdwapi/Makefile
@@ -1,10 +1,9 @@
 # Makefile for the xdesktopwaves API and its demo program
 
-CC     = gcc
-CFLAGS = -I/usr/X11R6/include -O2
-LINK   = gcc
-LFLAGS = -L/usr/X11R6/lib
-LIBS   = -lm -lX11
+CFLAGS += $(shell pkg-config --cflags x11 xext)
+LINK   = $(CC)
+LFLAGS = $(LDFLAGS)
+LIBS   = -lm $(shell pkg-config --libs x11 xext)
 
 all: xdwapidemo