diff --git a/ChangeLog b/ChangeLog
index f274dc32f..506c068d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
 2008-03-25  Badlop  <badlop@process-one.net>
 
 	* src/Makefile.in: Failure to install epam is not
-	critical (EJAB-573)
+	critical (EJAB-573). Only try to install epam if pam was enabled
+	in configure script (thanks to Etan Reisner)(EJAB-586)
 
 2008-03-24  Badlop  <badlop@process-one.net>
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 70596536f..fc981a4a0 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -40,6 +40,11 @@ ifeq (@transient_supervisors@, false)
   ERLC_FLAGS+=-DNO_TRANSIENT_SUPERVISORS
 endif
 
+INSTALL_EPAM=
+ifeq (@pam@, pam)
+  INSTALL_EPAM=install -m 750 epam $(PBINDIR)
+endif
+
 prefix = @prefix@
 
 SUBDIRS = @mod_irc@ @mod_pubsub@ @mod_muc@ @mod_proxy65@ @eldap@ @pam@ @web@ stringprep @tls@ @odbc@ @ejabberd_zlib@
@@ -104,7 +109,7 @@ install: all
 	install -d $(SODIR)
 	install -d $(PBINDIR)
 	install -m 644 *.so $(SODIR)
-	-install -m 750 epam $(PBINDIR)
+	$(INSTALL_EPAM)
 	install -d $(MSGSDIR)
 	install -m 644 msgs/*.msg $(MSGSDIR)
 	install -d $(ETCDIR)