diff --git a/dev-libs/objfw/objfw-1.0.3.recipe b/dev-libs/objfw/objfw-1.0.3.recipe
index d21d67353..f85ac8ef9 100644
--- a/dev-libs/objfw/objfw-1.0.3.recipe
+++ b/dev-libs/objfw/objfw-1.0.3.recipe
@@ -9,7 +9,7 @@ COPYRIGHT="2008-2023 Jonathan Schleifer"
 LICENSE="QPL
 	GNU GPL v2
 	GNU GPL v3"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://objfw.nil.im/downloads/objfw-$portVersion.tar.gz"
 CHECKSUM_SHA256="1c81d7d03578b2d9084fc5d8722d4eaa4bdc2f3f09ce41231e7ceab8212fae17"
 
@@ -64,10 +64,10 @@ REQUIRES_tls="
 
 PROVIDES_utils="
 	objfw${secondaryArchSuffix}_utils = $portVersion
-	cmd:ofarc$secondaryArchSuffix = $portVersion compat >= 1.0
-	cmd:ofdns$secondaryArchSuffix = $portVersion compat >= 1.0
-	cmd:ofhash$secondaryArchSuffix = $portVersion compat >= 1.0
-	cmd:ofhttp$secondaryArchSuffix = $portVersion compat >= 1.0
+	cmd:ofarc = $portVersion compat >= 1.0
+	cmd:ofdns = $portVersion compat >= 1.0
+	cmd:ofhash = $portVersion compat >= 1.0
+	cmd:ofhttp = $portVersion compat >= 1.0
 	"
 REQUIRES_utils="
 	haiku$secondaryArchSuffix
@@ -80,10 +80,10 @@ REQUIRES_utils="
 
 PROVIDES_devel="
 	objfw${secondaryArchSuffix}_devel = $portVersion
-	cmd:objfw_compile$secondaryArchSuffix = $portVersion compat >= 1.0
-	cmd:objfw_config$secondaryArchSuffix = $portVersion compat >= 1.0
-	cmd:objfw_embed$secondaryArchSuffix = $portVersion compat >= 1.0
-	cmd:objfw_new$secondaryArchSuffix = $portVersion compat >= 1.0
+	cmd:objfw_compile = $portVersion compat >= 1.0
+	cmd:objfw_config = $portVersion compat >= 1.0
+	cmd:objfw_embed = $portVersion compat >= 1.0
+	cmd:objfw_new = $portVersion compat >= 1.0
 	devel:libobjfw$secondaryArchSuffix = $libobjfwVersionCompat
 	devel:libobjfwrt$secondaryArchSuffix = $libobjfwrtVersionCompat
 	devel:libobjfwtls$secondaryArchSuffix = $libobjfwtlsVersionCompat
@@ -105,10 +105,17 @@ INSTALL()
 {
 	make install
 
+	if [ -n "$secondaryArchSuffix" ]; then
+		mv $binDir/* $prefix/bin/
+		binDir=$prefix/bin
+	fi
+
+	prepareInstalledDevelLibs libobjfw libobjfwrt libobjfwtls
+
 	packageEntries libs \
-		$libDir/libobjfw.so* \
-		$libDir/libobjfwrt.so*
-	packageEntries tls $libDir/libobjfwtls.so*
+		$libDir/libobjfw.so.* \
+		$libDir/libobjfwrt.so.*
+	packageEntries tls $libDir/libobjfwtls.so.*
 	packageEntries utils \
 		$binDir/ofarc $dataDir/ofarc \
 		$binDir/ofdns $dataDir/ofdns \