diff --git a/features/pkgconfig.prf b/features/pkgconfig.prf
index 3070d5d..55a0f48 100644
--- a/features/pkgconfig.prf
+++ b/features/pkgconfig.prf
@@ -1,24 +1,10 @@
-defineTest(pkgconfig_exists) {
-	packages = $$1
-	count(packages, 0): return(false)
-
-	system(pkg-config --exists $$packages) {
-		return(true)
-	} else {
-		return (false)
+# This file is intended replacement for Qt's link_pkgconfig
+for(PACKAGE, $$list($$unique(PKGCONFIG))) {
+	system(pkg-config --exists $$PACKAGE) {
+		CONFIG += $$PACKAGE
 	}
 }
 
-defineReplace(pkgconfig_cflags) {
-	packages = $$1
-	count(packages, 0): return(false)
-
-	return ($$system(pkg-config --cflags $$packages))
-}
-
-defineReplace(pkgconfig_libs) {
-	packages = $$1
-	count(packages, 0): return(false)
-
-	return ($$system(pkg-config --libs $$packages))
-}
+QMAKE_CXXFLAGS += $$system(pkg-config --cflags $$PKGCONFIG)
+QMAKE_CFLAGS += $$system(pkg-config --cflags $$PKGCONFIG)
+LIBS += $$system(pkg-config --libs $$PKGCONFIG)
diff --git a/lib/lib.pro b/lib/lib.pro
index 2581351..9e2936c 100644
--- a/lib/lib.pro
+++ b/lib/lib.pro
@@ -1,8 +1,12 @@
 TEMPLATE = lib
 CONFIG += static
 include (../config.pri)
+
+PKGCONFIG += xmms2-client-cpp
 load (../features/pkgconfig.prf)
 
+!xmms2-client-cpp:error (Please install the xmms2 c++ client library)
+
 MOC_DIR     = .moc
 OBJECTS_DIR = .obj
 
@@ -25,27 +29,8 @@ HEADERS += xclient.h \
 		   xmmsqt4.h \
 		   debug.h
 
-
-
-;RESOURCES = promoe.qrc
-;macx:RC_FILE = promoe.icns
-;macx:INCLUDEPATH = /sw/include
-
 QT += network
-;macx:QTPLUGIN += qjpeg
 QMAKE_LFLAGS += -L$$[QT_INSTALL_PLUGINS]/imageformats
 
-
 QMAKE_CXXFLAGS += -g
-;CONFIG += debug warn_on
 QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter
-
-XMMSCLIENTPKG += xmms2-client-cpp
-pkgconfig_exists ($$XMMSCLIENTPKG) {
-	QMAKE_CXXFLAGS  += $$pkgconfig_cflags($$XMMSCLIENTPKG)
-	LIBS += $$pkgconfig_libs($$XMMSCLIENTPKG)
-} else {
-	error (Please install the xmms2 c++ client library)
-}
-;CONFIG += avahi
-
diff --git a/src/src.pro b/src/src.pro
index df289d1..0dd8786 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,8 +1,11 @@
 TEMPLATE = app
 
 include (../config.pri)
+PKGCONFIG += xmms2-client-cpp
 load (../features/pkgconfig.prf)
 
+!xmms2-client-cpp:error (Please install the xmms2 c++ client library)
+
 COMPONENTS+=../lib/liblib.a
 LIBS += $$COMPONENTS
 PRE_TARGETDEPS = $$COMPONENTS
@@ -29,13 +32,5 @@ QMAKE_CXXFLAGS += -g
 ;CONFIG += debug warn_on
 QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter
 
-XMMSCLIENTPKG += xmms2-client-cpp
-pkgconfig_exists ($$XMMSCLIENTPKG) {
-	QMAKE_CXXFLAGS  += $$pkgconfig_cflags($$XMMSCLIENTPKG)
-	LIBS += $$pkgconfig_libs($$XMMSCLIENTPKG)
-} else {
-	error (Please install the xmms2 c++ client library)
-}
-
 ;CONFIG += avahi