diff --git a/configure.in b/configure.in
index 75d11b3..0d1570f 100644
--- a/configure.in
+++ b/configure.in
@@ -7,6 +7,60 @@ AM_INIT_AUTOMAKE(imlib2, 1.1.1)
 
 AM_CONFIG_HEADER(config.h)
 
+if test "x${exec_prefix}" = "xNONE"; then
+  if test "x${prefix}" = "xNONE"; then
+    bindir="${ac_default_prefix}/bin";
+  else
+    bindir="${prefix}/bin";
+  fi
+else
+  if test "x${prefix}" = "xNONE"; then
+    bindir="${ac_default_prefix}/bin";
+  else
+    bindir="${prefix}/bin";
+  fi
+fi
+
+if test "x${exec_prefix}" = "xNONE"; then
+  if test "x${prefix}" = "xNONE"; then
+    libdir="${ac_default_prefix}/lib";
+  else
+    libdir="${prefix}/lib";
+  fi
+else
+  if test "x${prefix}" = "xNONE"; then
+    libdir="${ac_default_prefix}/lib";
+  else
+    libdir="${prefix}/lib";
+  fi
+fi
+
+dnl Set PACKAGE_BIN_DIR in config.h.
+if test "x${bindir}" = 'xNONE'; then
+  if test "x${prefix}" = "xNONE"; then
+    AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${ac_default_prefix}/bin", [Installation directory for user executables])
+  else
+    AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${prefix}/bin", [Installation directory for user executables])
+  fi
+else
+  AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${bindir}", [Installation directory for user executables])
+fi
+
+if test "x${libdir}" = 'xNONE'; then
+  if test "x${prefix}" = "xNONE"; then
+    AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${ac_default_prefix}/lib", [Installation directory for libraries] )
+  else
+    AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${prefix}/lib", [Installation directory for libraries])
+  fi
+else
+  AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${libdir}", [Installation directory for libraries])
+fi
+
+dnl Set PACKAGE_SOURCE_DIR in config.h.
+packagesrcdir=`cd $srcdir && pwd`
+AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Source code directory])
+
+
 dnl here was freetype stuff (1)
 
 # check for freetype
@@ -355,13 +409,11 @@ AC_SUBST(dlopen_libs)
 AC_SUBST(freetype_cflags)
 AC_SUBST(freetype_libs)
 
-AC_SUBST(pkglibdir)
-
 dnl AC_SUBST(freetype_libs)
 dnl AC_SUBST(freetype_includes)
 
 AC_CONFIG_FILES([imlib2-config imlib2.pc Makefile loaders/Makefile src/Makefile test/Makefile \
-          filters/Makefile demo/Makefile doc/Makefile src/loaderpath.h \
+          filters/Makefile demo/Makefile doc/Makefile \
 	  ])
 AC_CONFIG_COMMANDS([default],[[
 chmod +x imlib2-config
diff --git a/imlib2.spec b/imlib2.spec
index eafaa52..ab3790e 100644
--- a/imlib2.spec
+++ b/imlib2.spec
@@ -149,37 +149,37 @@ test -x /sbin/ldconfig && /sbin/ldconfig
 %{_includedir}/*
 
 %files filters
-%attr(755,root,root) %{_libdir}/loaders/filter/*
+%attr(755,root,root) %{_libdir}/imlib2_loaders/filter/*
 
 %files loader_jpeg
-%attr(755,root,root) %{_libdir}/loaders/image/jpeg.*
+%attr(755,root,root) %{_libdir}/imlib2_loaders/image/jpeg.*
 
 %files loader_png
-%attr(755,root,root) %{_libdir}/loaders/image/png.*
+%attr(755,root,root) %{_libdir}/imlib2_loaders/image/png.*
 
 %files loader_argb
-%attr(755,root,root) %{_libdir}/loaders/image/argb.*
+%attr(755,root,root) %{_libdir}/imlib2_loaders/image/argb.*
 
 %files loader_bmp
-%attr(755,root,root) %{_libdir}/loaders/image/bmp.*
+%attr(755,root,root) %{_libdir}/imlib2_loaders/image/bmp.*
 
 %files loader_gif
-%attr(755,root,root) %{_libdir}/loaders/image/gif.*
+%attr(755,root,root) %{_libdir}/imlib2_loaders/image/gif.*
 
 %files loader_pnm
-%attr(755,root,root) %{_libdir}/loaders/image/pnm.*
+%attr(755,root,root) %{_libdir}/imlib2_loaders/image/pnm.*
 
 %files loader_tga
-%attr(755,root,root) %{_libdir}/loaders/image/tga.*
+%attr(755,root,root) %{_libdir}/imlib2_loaders/image/tga.*
 
 %files loader_tiff
-%attr(755,root,root) %{_libdir}/loaders/image/tiff.*
+%attr(755,root,root) %{_libdir}/imlib2_loaders/image/tiff.*
 
 %files loader_xpm
-%attr(755,root,root) %{_libdir}/loaders/image/xpm.*
+%attr(755,root,root) %{_libdir}/imlib2_loaders/image/xpm.*
 
 %files loader_gzbz2
-%attr(755,root,root) %{_libdir}/loaders/image/gzbz2.*
+%attr(755,root,root) %{_libdir}/imlib2_loaders/image/gzbz2.*
 
 %changelog
 * Mon Jan 8 2001 The Rasterman <raster@rasterman.com>
diff --git a/loaders/Makefile.am b/loaders/Makefile.am
index 0069409..abd82e4 100644
--- a/loaders/Makefile.am
+++ b/loaders/Makefile.am
@@ -11,7 +11,7 @@ INCLUDES             = -I. -I$(top_srcdir) -I$(top_srcdir)/src \
                        -I/usr/X11R6/include $(X_CFLAGS) \
                        -I$(prefix)/include -I$(includedir)
 
-pkgdir		     = $(libdir)/loaders/image
+pkgdir		     = $(libdir)/imlib2_loaders/image
 
 if JPEG_LOADER
 JPEG_L              = jpeg.la
diff --git a/src/Makefile.am b/src/Makefile.am
index 7b85fa4..06246ac 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@
 AUTOMAKE_OPTIONS     = 1.4 foreign
 
 # A list of all the files in the current directory which can be regenerated
-MAINTAINERCLEANFILES = Makefile.in loaderpath.h
+MAINTAINERCLEANFILES = Makefile.in
 
 LDFLAGS		     = -L/usr/X11R6/lib
 INCLUDES             = -I. -I$(top_srcdir) -I$(top_srcdir)/src \
@@ -24,7 +24,7 @@ libImlib2_la_SOURCES = scale.c image.c blend.c file.c rgbadraw.c api.c \
                        Imlib2.h image.h scale.h blend.h updates.h colormod.h \
 		       file.h common.h rgbadraw.h font.h format.h \
 		       rotate.h grad.h filter.h script.h dynamic_filters.h \
-		       color_helpers.h 
+		       color_helpers.h loaderpath.h
 
 EXTRA_libImlib2_la_SOURCES = rend.c ximage.c rgba.c color.c grab.c draw.c \
 			     context.c color.h context.h draw.h grab.h rend.h \
diff --git a/src/loaderpath.h b/src/loaderpath.h
new file mode 100644
index 0000000..ec6875b
--- /dev/null
+++ b/src/loaderpath.h
@@ -0,0 +1,3 @@
+#include "config.h"
+
+#define SYS_LOADERS_PATH PACKAGE_LIB_DIR"/imlib2_loaders"