diff --git a/ChangeLog b/ChangeLog
index 4ab45dfd..9b67799c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ Changes since version 0.92.0:
 - added check for --with-gnustepdir option to configure to verify that its
   argument is an absolute path
 - updated german translations (Torsten Marek <shlomme@gmx.net>)
+- fixed WPrefs.app to find its icons when not installed under GNUstep paths
 
 
 Changes since version 0.91.0:
diff --git a/WINGs/Makefile.am b/WINGs/Makefile.am
index f8d12984..46ed7efe 100644
--- a/WINGs/Makefile.am
+++ b/WINGs/Makefile.am
@@ -108,12 +108,12 @@ libWUtil_a_SOURCES = 	\
 	wutil.c
 
 
-AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\"
+AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" -DRESOURCE_PATH=\"$(datadir)/WINGs\" -DDEBUG
 
 AM_CFLAGS = @NOSTRICTALIASING@
 
 INCLUDES = -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
-	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@ -DDEBUG
+	@XFTFLAGS@ @HEADER_SEARCH_PATH@
 
 
 wcolorpanel.o: wcolorpanel.c
diff --git a/WINGs/wapplication.c b/WINGs/wapplication.c
index 5c10d875..e59b5ce0 100644
--- a/WINGs/wapplication.c
+++ b/WINGs/wapplication.c
@@ -181,7 +181,6 @@ WMPathForResourceOfType(char *resource, char *ext)
         return path;
     }
 
-
     if (getenv("GNUSTEP_SYSTEM_ROOT")) {
         path = checkFile(getenv("GNUSTEP_SYSTEM_ROOT"), appdir, ext, resource);
         if (path) {
diff --git a/WPrefs.app/Makefile.am b/WPrefs.app/Makefile.am
index 36373eeb..37269f95 100644
--- a/WPrefs.app/Makefile.am
+++ b/WPrefs.app/Makefile.am
@@ -42,7 +42,7 @@ WPrefs_SOURCES = \
 	imagebrowser.h \
 	xmodifier.c
 
-AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\"
+AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" -DRESOURCE_PATH=\"$(wpdatadir)\"
 
 AM_CFLAGS = @NOSTRICTALIASING@
 
diff --git a/WPrefs.app/main.c b/WPrefs.app/main.c
index c69f21ff..151729c7 100644
--- a/WPrefs.app/main.c
+++ b/WPrefs.app/main.c
@@ -100,7 +100,7 @@ main(int argc, char **argv)
 {
     Display *dpy;
     WMScreen *scr;
-    char *locale;
+    char *locale, *path;
     int i;
     char *display_name="";
 
@@ -110,6 +110,20 @@ main(int argc, char **argv)
 
     WMInitializeApplication("WPrefs", &argc, argv);
 
+    WMSetResourcePath(RESOURCE_PATH);
+    path = WMPathForResourceOfType("WPrefs.tiff", NULL);
+    if (!path) {
+        /* maybe it is run directly from the source directory */
+        WMSetResourcePath(".");
+        path = WMPathForResourceOfType("WPrefs.tiff", NULL);
+        if (!path) {
+            WMSetResourcePath("..");
+        }
+    }
+    if (path) {
+        wfree(path);
+    }
+
     if (argc>1) {
         for (i=1; i<argc; i++) {
             if (strcmp(argv[i], "-version")==0