diff --git a/ChangeLog b/ChangeLog
index c7a3364b1b..5f62d0697b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-19  Manish Singh  <yosh@gimp.org>
+
+	* m4macros/binreloc.m4: introduce automake conditional USE_BINRELOC.
+
+	* app/Makefile.am: ... and use the above here, so that -rpath is only
+	specified when binreloc functionality is enabled. Fixes bug #331677.
+
 2006-02-19  Sven Neumann  <sven@gimp.org>
 
 	* plug-ins/common/gif.c (save_image): removed warning when reusing
diff --git a/app/Makefile.am b/app/Makefile.am
index 2fa22c723b..427f965b9c 100644
--- a/app/Makefile.am
+++ b/app/Makefile.am
@@ -71,7 +71,7 @@ endif
 if OS_WIN32
 mwindows = -mwindows
 endif
-if OS_UNIX
+if USE_BINRELOC
 munix = -Wl,-rpath '-Wl,$$ORIGIN/../lib'
 endif
 
diff --git a/m4macros/binreloc.m4 b/m4macros/binreloc.m4
index c6126a8269..dff79be341 100644
--- a/m4macros/binreloc.m4
+++ b/m4macros/binreloc.m4
@@ -71,4 +71,5 @@ AC_DEFUN([AM_BINRELOC],
 	fi
 	AC_SUBST(BINRELOC_CFLAGS)
 	AC_SUBST(BINRELOC_LIBS)
+	AM_CONDITIONAL(USE_BINRELOC, test x$br_cv_binreloc = xyes)
 ])