diff --git a/src/Makefile b/src/Makefile
index a591625..a12ce5a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,10 +4,9 @@ DESTDIR	=
 BINDIR	= $(PREFIX)/bin
 CC	= cc
 CPPFLAGSF=
-CPPFLAGS= -I $(PREFIX)/include
-CFLAGSF	= -W `pkg-config gtk+-2.0 --cflags`
+CPPFLAGS=
+CFLAGSF	= -W
 CFLAGS	= -Wall -g -O2 -pedantic
-LDFLAGSF= `pkg-config gtk+-2.0 --libs`
 RM	= rm -f
 LN	= ln -f
 MKDIR	= mkdir -p
@@ -17,64 +16,64 @@ INSTALL	= install
 all: $(TARGETS)
 
 browser_OBJS = browser.o callbacks.o mime.o main.o
-browser_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
-browser_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -L $(PREFIX)/lib -Wl,-rpath,$(PREFIX)/lib -lSystem -lDesktop
+browser_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags libSystem libDesktop`
+browser_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libSystem libDesktop`
 
 browser: $(browser_OBJS)
 	$(CC) -o browser $(browser_OBJS) $(browser_LDFLAGS)
 
 copy_OBJS = copy.o
-copy_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
-copy_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
+copy_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags gtk+-2.0`
+copy_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs gtk+-2.0`
 
 copy: $(copy_OBJS)
 	$(CC) -o copy $(copy_OBJS) $(copy_LDFLAGS)
 
 delete_OBJS = delete.o
-delete_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
-delete_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
+delete_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags gtk+-2.0`
+delete_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs gtk+-2.0`
 
 delete: $(delete_OBJS)
 	$(CC) -o delete $(delete_OBJS) $(delete_LDFLAGS)
 
 desktop_OBJS = desktop.o desktopicon.o
-desktop_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
-desktop_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -L $(PREFIX)/lib -Wl,-rpath,$(PREFIX)/lib -lSystem mime.o
+desktop_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags libSystem gtk+-2.0`
+desktop_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libSystem gtk+-2.0` mime.o
 
 desktop: $(desktop_OBJS)
 	$(CC) -o desktop $(desktop_OBJS) $(desktop_LDFLAGS)
 
 desktop-settings_OBJS = settings.o
-desktop-settings_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
-desktop-settings_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
+desktop-settings_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags gtk+-2.0`
+desktop-settings_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs gtk+-2.0`
 
 desktop-settings: $(desktop-settings_OBJS)
 	$(CC) -o desktop-settings $(desktop-settings_OBJS) $(desktop-settings_LDFLAGS)
 
 move_OBJS = move.o
-move_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
-move_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
+move_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags gtk+-2.0`
+move_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs gtk+-2.0`
 
 move: $(move_OBJS)
 	$(CC) -o move $(move_OBJS) $(move_LDFLAGS)
 
 open_OBJS = open.o
-open_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
-open_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -L $(PREFIX)/lib -Wl,-rpath,$(PREFIX)/lib -lSystem mime.o
+open_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags libSystem gtk+-2.0`
+open_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libSystem gtk+-2.0` mime.o
 
 open: $(open_OBJS)
 	$(CC) -o open $(open_OBJS) $(open_LDFLAGS)
 
 properties_OBJS = properties.o
-properties_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
-properties_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -L $(PREFIX)/lib -Wl,-rpath,$(PREFIX)/lib -lSystem mime.o
+properties_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags libSystem gtk+-2.0`
+properties_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libSystem gtk+-2.0` mime.o
 
 properties: $(properties_OBJS)
 	$(CC) -o properties $(properties_OBJS) $(properties_LDFLAGS)
 
 view_OBJS = view.o
-view_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
-view_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -L $(PREFIX)/lib -Wl,-rpath,$(PREFIX)/lib -lSystem -lDesktop mime.o
+view_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags libSystem libDesktop`
+view_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libSystem libDesktop` mime.o
 
 view: $(view_OBJS)
 	$(CC) -o view $(view_OBJS) $(view_LDFLAGS)
diff --git a/src/project.conf b/src/project.conf
index 95bd69e..f2aad31 100644
--- a/src/project.conf
+++ b/src/project.conf
@@ -1,15 +1,14 @@
 targets=browser,copy,delete,desktop,desktop-settings,move,open,properties,view
-cppflags=-I $(PREFIX)/include
-#cppflags=-I $(PREFIX)/include -D EMBEDDED
-cflags_force=-W `pkg-config gtk+-2.0 --cflags`
+#cppflags=-D EMBEDDED
+cflags_force=-W
 cflags=-Wall -g -O2 -pedantic
-ldflags_force=`pkg-config gtk+-2.0 --libs`
 dist=Makefile,browser.h,callbacks.h,common.c,desktop.h,desktopicon.h,mime.h
 
 [browser]
 type=binary
-ldflags=-L $(PREFIX)/lib -Wl,-rpath,$(PREFIX)/lib -lSystem -lDesktop
 sources=browser.c,callbacks.c,mime.c,main.c
+cflags=`pkg-config --cflags libSystem libDesktop`
+ldflags=`pkg-config --libs libSystem libDesktop`
 install=$(BINDIR)
 
 [browser.c]
@@ -27,17 +26,22 @@ depends=browser.h,mime.h
 [copy]
 type=binary
 sources=copy.c
+cflags=`pkg-config --cflags gtk+-2.0`
+ldflags=`pkg-config --libs gtk+-2.0`
 install=$(BINDIR)
 
 [delete]
 type=binary
 sources=delete.c
+cflags=`pkg-config --cflags gtk+-2.0`
+ldflags=`pkg-config --libs gtk+-2.0`
 install=$(BINDIR)
 
 [desktop]
 type=binary
 sources=desktop.c,desktopicon.c
-ldflags=-L $(PREFIX)/lib -Wl,-rpath,$(PREFIX)/lib -lSystem mime.o
+cflags=`pkg-config --cflags libSystem gtk+-2.0`
+ldflags=`pkg-config --libs libSystem gtk+-2.0` mime.o
 install=$(BINDIR)
 
 [desktop.c]
@@ -51,17 +55,22 @@ cppflags=-D PREFIX=\"$(PREFIX)\"
 [desktop-settings]
 type=binary
 sources=settings.c
+cflags=`pkg-config --cflags gtk+-2.0`
+ldflags=`pkg-config --libs gtk+-2.0`
 install=$(BINDIR)
 
 [move]
 type=binary
 sources=move.c
+cflags=`pkg-config --cflags gtk+-2.0`
+ldflags=`pkg-config --libs gtk+-2.0`
 install=$(BINDIR)
 
 [open]
 type=binary
 sources=open.c
-ldflags=-L $(PREFIX)/lib -Wl,-rpath,$(PREFIX)/lib -lSystem mime.o
+cflags=`pkg-config --cflags libSystem gtk+-2.0`
+ldflags=`pkg-config --libs libSystem gtk+-2.0` mime.o
 install=$(BINDIR)
 
 [open.c]
@@ -70,13 +79,15 @@ depends=mime.o
 [properties]
 type=binary
 sources=properties.c
-ldflags=-L $(PREFIX)/lib -Wl,-rpath,$(PREFIX)/lib -lSystem mime.o
+cflags=`pkg-config --cflags libSystem gtk+-2.0`
+ldflags=`pkg-config --libs libSystem gtk+-2.0` mime.o
 install=$(BINDIR)
 
 [view]
 type=binary
 sources=view.c
-ldflags=-L $(PREFIX)/lib -Wl,-rpath,$(PREFIX)/lib -lSystem -lDesktop mime.o
+cflags=`pkg-config --cflags libSystem libDesktop`
+ldflags=`pkg-config --libs libSystem libDesktop` mime.o
 install=$(BINDIR)
 
 [view.c]
diff --git a/tools/Makefile b/tools/Makefile
index 5332be6..92f2849 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -5,9 +5,9 @@ BINDIR	= $(PREFIX)/bin
 CC	= cc
 CPPFLAGSF=
 CPPFLAGS=
-CFLAGSF	= -W `pkg-config gtk+-2.0 --cflags`
+CFLAGSF	= -W `pkg-config --cflags gtk+-2.0`
 CFLAGS	= -Wall -g -O2
-LDFLAGSF= `pkg-config gtk+-2.0 --libs`
+LDFLAGSF= `pkg-config --libs gtk+-2.0`
 RM	= rm -f
 LN	= ln -f
 MKDIR	= mkdir -p
diff --git a/tools/project.conf b/tools/project.conf
index f98c63b..d3080fb 100644
--- a/tools/project.conf
+++ b/tools/project.conf
@@ -1,7 +1,7 @@
 targets=dirtree,iconlist
-cflags_force=-W `pkg-config gtk+-2.0 --cflags`
+cflags_force=-W `pkg-config --cflags gtk+-2.0`
 cflags=-Wall -g -O2
-ldflags_force=`pkg-config gtk+-2.0 --libs`
+ldflags_force=`pkg-config --libs gtk+-2.0`
 dist=Makefile
 
 [dirtree]