diff --git a/configure.ac b/configure.ac
index 365a87a..2be5909 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,8 @@
 # 
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT(src/wmconfig.c)
+AC_INIT
+AC_CONFIG_SRCDIR([src/wmconfig.c])
 AM_INIT_AUTOMAKE(wmakerconf, 2.12)
 AC_CONFIG_HEADERS(config.h)
 AM_MAINTAINER_MODE
diff --git a/configure.ac b/configure.ac
index 2be5909..b7c014a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -133,11 +133,12 @@ AC_CHECK_LIB(m, cos)
 
 libwmfun="no"
 # Checks for wraster lib
-AC_PATH_PROG(wraster, get-wings-flags)
+PKG_CHECK_EXISTS([wrlib WUtil], [wraster="yes"])
 if test -n "$wraster"; then
-        WRASTERLIBS=`($wraster --ldflags --libs 2>/dev/null || $wraster --lflags --libs) | xargs`
+        PKG_CHECK_MODULES([WRASTER], [wrlib WUtil])
+        WRASTERLIBS=$WRASTER_LIBS
 	WRASTERLIBS="$WRASTERLIBS -lX11"
-        WRASTERINCLUDES=`$wraster --cflags`
+        WRASTERINCLUDES=$WRASTER_CFLAGS
         MKPREVIEW="mkpreview"
         OLD_LDFLAGS="$LDFLAGS"
         OLD_CPPFLAGS="$CPPFLAGS"