diff --git a/ChangeLog b/ChangeLog
index 869150b18..9d117d400 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -46,6 +46,9 @@
 	* src/tracks/automation_track.cpp:
 	Allow dragging automatable views directly onto an automation-track
 
+	* configure.in:
+	Fix LIBDIR for when people do not use --prefix
+
 2008-06-28	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
 	* plugins/Makefile.am:
diff --git a/configure.in b/configure.in
index 0aaf2cac2..54f9a77d2 100644
--- a/configure.in
+++ b/configure.in
@@ -18,10 +18,14 @@ AM_PROG_LIBTOOL
 
 if ! test -z "${prefix}" -o "${prefix}" = "NONE" ; then
 	CFLAGS="$CFLAGS -I${prefix}/include"
-	CPPFLAGS="$CPPFLAGS -I${prefix}/include -DLIBDIR='\"${libdir}\"'"
+	CPPFLAGS="$CPPFLAGS -I${prefix}/include"
 	LDFLAGS="$LDFLAGS -L${prefix}/bin"
 fi
 
+if ! test -z "${libdir}" ; then
+	CPPFLAGS="$CPPFLAGS -DLIBDIR='\"${libdir}\"'"
+fi
+
 AH_TEMPLATE(BUILD_LINUX, [Build LMMS for Linux])
 AH_TEMPLATE(BUILD_WIN32, [Build LMMS for Win32])
 AH_TEMPLATE(WIN32, [Build LMMS for Win32])