diff --git a/src/CHANGELOG b/src/CHANGELOG
index 6a3b657a5..beb0c5adb 100755
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@@ -19,6 +19,10 @@ ECL 9.10.2:
  - In CLX, there were a couple of typos in the code related to locks and ECL.
    These typos only revealed in multithreaded builds of the CLX library.
 
+ - Under OS X, --enable-rpath works again. It was broken for about a year
+   due to my misunderstanding of how -install_name works and the differences
+   between that and -rpath.
+
 ECL 9.10.1:
 ===========
 
diff --git a/src/aclocal.m4 b/src/aclocal.m4
index a9029a868..349b5aa5f 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -345,7 +345,7 @@ case "${host_os}" in
                 # well with our signal handler.
                 enable_boehm=included
 		SONAME="${SHAREDPREFIX}ecl.SOVERSION.${SHAREDEXT}"
-		SONAME_LDFLAGS="-Wl,-install_name,SONAME -Wl,-compatibility_version,${PACKAGE_VERSION}"
+		SONAME_LDFLAGS="-Wl,-install_name,@libdir\@/SONAME -Wl,-compatibility_version,${PACKAGE_VERSION}"
 		;;
 	nsk*)
 		# HP Non-Stop platform
diff --git a/src/configure b/src/configure
index ba84de3d4..5a0ceb59f 100755
--- a/src/configure
+++ b/src/configure
@@ -4494,7 +4494,7 @@ case "${host_os}" in
                 # well with our signal handler.
                 enable_boehm=included
 		SONAME="${SHAREDPREFIX}ecl.SOVERSION.${SHAREDEXT}"
-		SONAME_LDFLAGS="-Wl,-install_name,SONAME -Wl,-compatibility_version,${PACKAGE_VERSION}"
+		SONAME_LDFLAGS="-Wl,-install_name,@libdir\@/SONAME -Wl,-compatibility_version,${PACKAGE_VERSION}"
 		;;
 	nsk*)
 		# HP Non-Stop platform