diff --git a/auxdir/x_ac_munge.m4 b/auxdir/x_ac_munge.m4
index 96e414fa4935830cc6728b1aeec720ec82eb98dc..656dd3d6133ab4afd9273253d01b5be14ecbb9d9 100644
--- a/auxdir/x_ac_munge.m4
+++ b/auxdir/x_ac_munge.m4
@@ -36,7 +36,7 @@ AC_DEFUN([X_AC_MUNGE], [
         test -f "$d/include/munge.h" || continue
 	for bit in $_x_ac_munge_libs; do
           test -d "$d/$bit" || continue
-        
+
  	  _x_ac_munge_libs_save="$LIBS"
           LIBS="-L$d/$bit -lmunge $LIBS"
           AC_LINK_IFELSE(
@@ -54,7 +54,7 @@ AC_DEFUN([X_AC_MUNGE], [
   else
     MUNGE_LIBS="-lmunge"
     MUNGE_CPPFLAGS="-I$x_ac_cv_munge_dir/include"
-    MUNGE_LDFLAGS="-L$x_ac_cv_munge_dir/$bit"
+    MUNGE_LDFLAGS="-Wl,-rpath -Wl,$x_ac_cv_munge_dir/$bit -L$x_ac_cv_munge_dir/$bit"
   fi
 
   AC_SUBST(MUNGE_LIBS)
diff --git a/configure b/configure
index dbbda629723857aecd90d7c095a4e774831f6cd3..9e9d622de3ad7149bbd9c792018e5ab4944bce7f 100755
--- a/configure
+++ b/configure
@@ -21072,7 +21072,7 @@ $as_echo "$as_me: WARNING: unable to locate munge installation" >&2;}
   else
     MUNGE_LIBS="-lmunge"
     MUNGE_CPPFLAGS="-I$x_ac_cv_munge_dir/include"
-    MUNGE_LDFLAGS="-L$x_ac_cv_munge_dir/$bit"
+    MUNGE_LDFLAGS="-Wl,-rpath -Wl,$x_ac_cv_munge_dir/$bit -L$x_ac_cv_munge_dir/$bit"
   fi