diff --git a/HxCFloppyEmulator_cmdline/build/Makefile b/HxCFloppyEmulator_cmdline/build/Makefile
index 7a787e4f..f0ee9ce3 100644
--- a/HxCFloppyEmulator_cmdline/build/Makefile
+++ b/HxCFloppyEmulator_cmdline/build/Makefile
@@ -38,8 +38,10 @@ LIBUSBHXCFE = libusbhxcfe.so
 ifeq ($(TARGET), Darwin)
 	MACOSX_ARCH ?= -arch arm64 -arch x86_64
 	MACOSX_MIN_VER ?= 10.9
+	# Allow the CLI to run from the App bundle or from somewhere like /usr/local/bin (with libs in /usr/local/lib)
+	RPATHS = -Wl,-rpath,@executable_path/../Frameworks,-rpath,@executable_path/../lib
 	CFLAGS += ${MACOSX_ARCH} -mmacosx-version-min=${MACOSX_MIN_VER}
-	LDFLAGS += -lc -lm -ldl -lpthread ${MACOSX_ARCH} -mmacosx-version-min=${MACOSX_MIN_VER}
+	LDFLAGS += -lc -lm -ldl -lpthread ${MACOSX_ARCH} -mmacosx-version-min=${MACOSX_MIN_VER} ${RPATHS}
 	LIBHXCFE = libhxcfe.dylib
 	LIBUSBHXCFE = libusbhxcfe.dylib
 endif
diff --git a/HxCFloppyEmulator_software/build/Makefile b/HxCFloppyEmulator_software/build/Makefile
index 87a12822..ff540a86 100644
--- a/HxCFloppyEmulator_software/build/Makefile
+++ b/HxCFloppyEmulator_software/build/Makefile
@@ -93,8 +93,10 @@ endif
 ifeq ($(TARGET), Darwin)
 	MACOSX_ARCH ?= -arch arm64 -arch x86_64
 	MACOSX_MIN_VER ?= 10.9
+	# For the GUI application, libraries will always be in the Frameworks directory.
+	RPATHS = -Wl,-rpath,@executable_path/../Frameworks
 	CFLAGS += -DOSX ${MACOSX_ARCH} -mmacosx-version-min=${MACOSX_MIN_VER}
-	LDFLAGS += -lc -lm -ldl -lpthread -framework Cocoa -framework AudioToolBox -framework UniformTypeIdentifiers ${MACOSX_ARCH} -mmacosx-version-min=${MACOSX_MIN_VER}
+	LDFLAGS += -lc -lm -ldl -lpthread -framework Cocoa -framework AudioToolBox -framework UniformTypeIdentifiers ${MACOSX_ARCH} -mmacosx-version-min=${MACOSX_MIN_VER} ${RPATHS}
 	LIBHXCFE = libhxcfe.dylib
 	LIBUSBHXCFE = libusbhxcfe.dylib
 else
diff --git a/libhxcfe/build/Makefile b/libhxcfe/build/Makefile
index 67565dd2..ed93bf52 100644
--- a/libhxcfe/build/Makefile
+++ b/libhxcfe/build/Makefile
@@ -73,8 +73,11 @@ endif
 ifeq ($(TARGET), Darwin)
 	MACOSX_ARCH ?= -arch arm64 -arch x86_64
 	MACOSX_MIN_VER ?= 10.9
+	# Search paths for other dylibs (like CAPSImage)
+	# @loader_path = same directory as this lib.
+	RPATHS = -Wl,-rpath,@loader_path,-rpath,/Library/Frameworks,-rpath,/usr/local/lib
 	CFLAGS += ${MACOSX_ARCH} -mmacosx-version-min=${MACOSX_MIN_VER}
-	LDFLAGS += -lc -lm -ldl ${MACOSX_ARCH} -dynamiclib -current_version 2.0 -install_name @executable_path/../Frameworks/libhxcfe.dylib -mmacosx-version-min=${MACOSX_MIN_VER}
+	LDFLAGS += -lc -lm -ldl ${MACOSX_ARCH} -dynamiclib -current_version 2.0 -install_name @rpath/libhxcfe.dylib -mmacosx-version-min=${MACOSX_MIN_VER} ${RPATHS}
 	EXEC = libhxcfe.dylib
 endif
 
diff --git a/libhxcfe/sources/floppy_loader.c b/libhxcfe/sources/floppy_loader.c
index 5a6f426c..9ab7ec53 100644
--- a/libhxcfe/sources/floppy_loader.c
+++ b/libhxcfe/sources/floppy_loader.c
@@ -134,7 +134,7 @@ HXCFE* hxcfe_init(void)
 #if defined(WIN32)
 		hxcfe_execScriptLine( hxcfe, "set SPSCAPS_LIB_NAME CAPSImg.dll" );
 #elif __APPLE__
-		hxcfe_execScriptLine( hxcfe, "set SPSCAPS_LIB_NAME CAPSImage.framework/CAPSImage,CAPSImg.framework/CAPSImg" );
+		hxcfe_execScriptLine( hxcfe, "set SPSCAPS_LIB_NAME @rpath/CAPSImage.framework/CAPSImage,@rpath/CAPSImg.framework/CAPSImg" );
 #else
 		hxcfe_execScriptLine( hxcfe, "set SPSCAPS_LIB_NAME libcapsimage.so.5,libcapsimage.so.5.1,libcapsimage.so" );
 #endif
diff --git a/libusbhxcfe/build/Makefile b/libusbhxcfe/build/Makefile
index c97f29ef..7e86cd41 100644
--- a/libusbhxcfe/build/Makefile
+++ b/libusbhxcfe/build/Makefile
@@ -66,7 +66,9 @@ ifeq ($(TARGET), Darwin)
 	MACOSX_ARCH ?= -arch arm64 -arch x86_64
 	MACOSX_MIN_VER ?= 10.9
 	CFLAGS += ${MACOSX_ARCH} -mmacosx-version-min=${MACOSX_MIN_VER}
-	LDFLAGS +=  -lc -lm -ldl ${MACOSX_ARCH} -dynamiclib -current_version 2.0 -install_name @executable_path/../Frameworks/libusbhxcfe.dylib -mmacosx-version-min=${MACOSX_MIN_VER}
+	# Load libhxcfe from the same directory as this library.
+	RPATHS = -Wl,-rpath,@loader_path
+	LDFLAGS +=  -lc -lm -ldl ${MACOSX_ARCH} -dynamiclib -current_version 2.0 -install_name @rpath/libusbhxcfe.dylib -mmacosx-version-min=${MACOSX_MIN_VER} ${RPATHS}
 	EXEC = libusbhxcfe.dylib
 endif