Index: .hgignore
==================================================================
--- .hgignore
+++ .hgignore
@@ -1,10 +1,10 @@
 syntax: glob
 *.a
+*.bundle
 *.dll
 *.dylib
-*.impl
 *.o
 *.orig
 *.so
 *~
 .deps

Index: m4/buildsys.m4
==================================================================
--- m4/buildsys.m4
+++ m4/buildsys.m4
@@ -92,17 +92,17 @@
 	AC_MSG_CHECKING(for shared library system)
 	case "$host_os" in
 		darwin*)
 			AC_MSG_RESULT(Darwin)
 			LIB_CFLAGS='-fPIC -DPIC'
-			LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
+			LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR} -install_name ${libdir}/$$(i=${SHARED_LIB}; echo $${i%.dylib}).${LIB_MAJOR}.dylib'
 			LIB_PREFIX='lib'
 			LIB_SUFFIX='.dylib'
 			LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
 			PLUGIN_CFLAGS='-fPIC -DPIC'
 			PLUGIN_LDFLAGS='-bundle -undefined dynamic_lookup'
-			PLUGIN_SUFFIX='.impl'
+			PLUGIN_SUFFIX='.bundle'
 			INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$$i'
 			UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib'
 			CLEAN_LIB=''
 			;;
 		solaris*)

Index: tests/Makefile
==================================================================
--- tests/Makefile
+++ tests/Makefile
@@ -71,11 +71,12 @@
 	echo "Uploading files to iOS device ${IOS_HOST} at ${IOS_TMP}..."
 	ssh ${IOS_USER}@${IOS_HOST} \
 		'rm -fr ${IOS_TMP} && mkdir -p ${IOS_TMP}/plugin'
 	scp -q ../src/libobjfw.dylib tests testfile.bin testfile.txt \
 		serialization.xml ${IOS_USER}@${IOS_HOST}:${IOS_TMP}/
-	scp -q plugin/TestPlugin.impl ${IOS_USER}@${IOS_HOST}:${IOS_TMP}/plugin/
+	scp -q plugin/TestPlugin.bundle \
+		${IOS_USER}@${IOS_HOST}:${IOS_TMP}/plugin/
 	echo "Running tests binary on iOS device ${IOS_HOST}..."
 	ssh ${IOS_USER}@${IOS_HOST} \
 		'cd ${IOS_TMP} && ${TEST_LAUNCHER} ./tests'
 
 EBOOT.PBP: ${PROG_NOINST}