diff --git a/ChangeLog b/ChangeLog
index 68172c88c..d2e410e86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,10 +2,14 @@
 
 	* src/mod_pubsub/mod_pubsub.erl: add condition inclusion of pep in
 	disco identity (EJAB-564)
+
 	* src/ejabberd_local.erl: The iq_response table wasn't cloned
 	automatically on all nodes which resulted in a single point of
 	failure (backport from trunk, thanks to Alexey)
 
+	* src/Makefile.in: Do not ignore values passed from configure
+	(thanks to Justin Boffemmyer)(EJAB-592)
+
 2008-03-31  Badlop  <badlop@process-one.net>
 
 	* doc/webadmmain.png: Updated to ejabberd 2.0.0
diff --git a/src/Makefile.in b/src/Makefile.in
index fc981a4a0..d3168165b 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -46,6 +46,7 @@ ifeq (@pam@, pam)
 endif
 
 prefix = @prefix@
+exec_prefix = @exec_prefix@
 
 SUBDIRS = @mod_irc@ @mod_pubsub@ @mod_muc@ @mod_proxy65@ @eldap@ @pam@ @web@ stringprep @tls@ @odbc@ @ejabberd_zlib@
 ERLSHLIBS = expat_erl.so
@@ -55,15 +56,15 @@ BEAMS = $(SOURCES:.erl=.beam)
 
 DESTDIR =
 
-EJABBERDDIR = $(DESTDIR)@prefix@/var/lib/ejabberd
+EJABBERDDIR = $(DESTDIR)@localstatedir@/lib/ejabberd
 BEAMDIR = $(EJABBERDDIR)/ebin
 PRIVDIR = $(EJABBERDDIR)/priv
 SODIR = $(PRIVDIR)/lib
 PBINDIR = $(PRIVDIR)/bin
 MSGSDIR = $(PRIVDIR)/msgs
-LOGDIR = $(DESTDIR)@prefix@/var/log/ejabberd
-ETCDIR = $(DESTDIR)@prefix@/etc/ejabberd
-SBINDIR = $(DESTDIR)@prefix@/sbin
+LOGDIR = $(DESTDIR)@localstatedir@/log/ejabberd
+ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
+SBINDIR = $(DESTDIR)@sbindir@
 
 ifeq ($(shell uname),Darwin)
 DYNAMIC_LIB_CFLAGS = -fPIC -bundle -flat_namespace -undefined suppress