@@ -27,11 +27,11 @@
 			OBJCFLAGS="$OBJCFLAGS -noixemul"
 			LDFLAGS="$LDFLAGS -noixemul"
 			enable_files="yes"	# Required for reading ENV:
 
 			AC_SUBST(NOIXEMUL, -noixemul)
-			AC_SUBST(OBJFW_RT_MORPHOS_LIB, objfw-rt.library)
+			AC_SUBST(OBJFW_RT_MORPHOS_LIB, objfw_rt.library)
 		])
 
 		enable_shared="no"
 		enable_threads="no"
 		;;
@@ -249,10 +249,11 @@
 	AC_SUBST(LOOKUP_ASM_LIB_A, "lookup-asm.lib.a")
 	AC_SUBST(LOOKUP_ASM_LOOKUP_ASM_LIB_A, "lookup-asm/lookup-asm.lib.a")
 
 	BUILDSYS_FRAMEWORK([
 		AC_SUBST(OBJFW_FRAMEWORK, "ObjFW.framework")
+		build_framework="yes"
 	])
 ], [
 	AC_SUBST(LIBOBJFW_DEP, "../src/libobjfw.a")
 	AC_SUBST(LIBOBJFW_DEP_LVL2, "../../src/libobjfw.a")
 ])
@@ -372,17 +373,21 @@
 		AC_SUBST(RUNTIME, "runtime")
 		AC_SUBST(RUNTIME_FLAGS)
 
 		AS_IF([test x"$enable_shared" != x"no"], [
 			AC_SUBST(OBJFW_RT_SHARED_LIB,
-				"${LIB_PREFIX}objfw-rt${LIB_SUFFIX}")
+				"${LIB_PREFIX}objfw_rt${LIB_SUFFIX}")
 		])
 		AS_IF([test x"$enable_static" = x"yes" \
 			-o x"$enable_shared" = x"no"], [
-			AC_SUBST(OBJFW_RT_STATIC_LIB, "libobjfw-rt.a")
+			AC_SUBST(OBJFW_RT_STATIC_LIB, "libobjfw_rt.a")
+		])
+		AS_IF([test x"$build_framework" = x"yes"], [
+			AC_SUBST(OBJFW_RT_FRAMEWORK, "ObjFW_RT.framework")
 		])
-		AC_SUBST(RUNTIME_LIBS, "-lobjfw-rt")
+		AC_SUBST(RUNTIME_LIBS, "-lobjfw_rt")
+		AC_SUBST(RUNTIME_FRAMEWORK_LIBS, "-framework ObjFW_RT")
 
 		AS_IF([test x"$enable_seluid24" = x"yes"], [
 			AC_DEFINE(OF_SELUID24, 1,
 				[Whether to use 24 bit selector UIDs])
 		])
@@ -439,10 +444,11 @@
 		AC_DEFINE(OF_APPLE_RUNTIME, 1,
 			[Whether we use the Apple ObjC runtime])
 
 		AC_CHECK_LIB(objc, objc_msgSend, [
 			AC_SUBST(RUNTIME_LIBS, "-lobjc")
+			AC_SUBST(RUNTIME_FRAMEWORK_LIBS, "-lobjc")
 		], [
 			AC_MSG_ERROR([libobjc not found!])
 		])
 		;;
 esac
@@ -458,10 +464,12 @@
 case "$host_os" in
 	darwin*)
 		AC_SUBST(LDFLAGS_REEXPORT, ["-Wl,-reexport-lobjfw"])
 		AS_IF([test x"$objc_runtime" = x"Apple runtime"], [
 			AC_SUBST(REEXPORT_RUNTIME, ["-Wl,-reexport-lobjc"])
+			AC_SUBST(REEXPORT_RUNTIME_FRAMEWORK,
+				["-Wl,-reexport-lobjc"])
 			AC_SUBST(WEAK_NSFOUNDATIONVERSIONNUMBER,
 				["-Wl,-U,_NSFoundationVersionNumber"])
 			LDFLAGS="$LDFLAGS -Wl,-U,_NSFoundationVersionNumber"
 		])
 
@@ -470,11 +478,13 @@
 				LDFLAGS="$LDFLAGS -Wl,-U,___gxx_personality_v0"
 			])
 			AS_IF([test x"$exception_type" = x"SjLj"], [
 				LDFLAGS="$LDFLAGS -Wl,-U,___gxx_personality_sj0"
 			])
-			AC_SUBST(REEXPORT_RUNTIME, ["-Wl,-reexport-lobjfw-rt"])
+			AC_SUBST(REEXPORT_RUNTIME, ["-Wl,-reexport-lobjfw_rt"])
+			AC_SUBST(REEXPORT_RUNTIME_FRAMEWORK,
+				["-Wl,-reexport_framework,ObjFW_RT"])
 		])
 
 		AC_CHECK_HEADERS(sysdir.h)
 		AC_CHECK_FUNCS(sysdir_start_search_path_enumeration)
 
@@ -1290,21 +1300,18 @@
 		AC_SUBST(BRIDGE, "bridge")
 
 		AS_IF([test x"$enable_shared" != x"no"], [
 			AC_SUBST(OBJFW_BRIDGE_SHARED_LIB,
 				"${LIB_PREFIX}objfw_bridge${LIB_SUFFIX}")
-
-			case "$host_os" in
-				darwin*)
-					AC_SUBST(OBJFW_BRIDGE_FRAMEWORK,
-						"ObjFW_Bridge.framework")
-					;;
-			esac
 		])
 		AS_IF([test x"$enable_static" = x"yes" \
 		    -o x"$enable_shared" = x"no"], [
 			AC_SUBST(OBJFW_BRIDGE_STATIC_LIB, "libobjfw_bridge.a")
+		])
+		AS_IF([test x"$build_framework" = x"yes"], [
+			AC_SUBST(OBJFW_BRIDGE_FRAMEWORK,
+				"ObjFW_Bridge.framework")
 		])
 	])
 ])
 
 dnl This needs to be after all other header checks, as they include unistd.h,