diff --git a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe
new file mode 100644
index 000000000..a4f9de944
--- /dev/null
+++ b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.9.recipe
@@ -0,0 +1,68 @@
+SUMMARY="Easy to use Keymap Switcher for Haiku"
+DESCRIPTION="This is a keymap switcher for Haiku. It is very similar to what you used to have in windows to change the keymap with hotkeys, but has some additional features (and lacks some, for sure)."
+HOMEPAGE="http://www.sf.net/projects/switcher" 
+COPYRIGHT="1999-2003 Stas Maximov"
+LICENSE="BSD (4-clause)"
+SRC_URI="cvs://:pserver:anonymous@switcher.cvs.sourceforge.net:/cvsroot/switcher/keymapswitcher\(haiku\)#release_1_2_7_9"
+REVISION="2"
+ARCHITECTURES="x86_gcc2 ?x86"
+
+PROVIDES="
+	keymapswitcher = $portVersion compat >= 1.2.7
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	$REQUIRES
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	cmd:mkdepend
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	makefile_engine
+	"
+
+SOURCE_DIR="$portVersionedName"
+
+PATCH()
+{
+	# TODO: Remove once in Haiku PM is in sync with master!
+
+	# B_TRANSLATION_CONTEXT was formerly known as B_TRANSLATE_CONTEXT.
+	sed -i "s,B_TRANSLATION_CONTEXT,B_TRANSLATE_CONTEXT," \
+		DeskView.cpp \
+		KeymapSwitcher.cpp \
+		SettingsWindow.cpp
+
+	# add liblocale to libraries to link against
+	sed -i "s,^\(LIBS=.*\),\1 locale," app.makefile
+
+	# patch away building the bindcatalogs target
+	sed -i "s,bindcatalogs,," makefile
+}
+
+BUILD()
+{
+	make $jobArgs BUILDHOME=/boot/common/develop
+}
+
+INSTALL()
+{
+	# We're not interested in the package, but that target copies the
+	# interesting files to a well-known directory structure. Otherwise we'd have
+	# to find out the name of the object dir and collect everything ourselves.
+	# Obviously an install target would be even better.
+	make BUILDHOME=/boot/common/develop package
+
+	addOnInstallDir=$addOnsDir/input_server/filters
+	mkdir -p $addOnInstallDir $preferencesDir
+	cp -a dist/common/add-ons/input_server/filters/keymap_switcher \
+		$addOnInstallDir
+	cp -a dist/common/bin/KeymapSwitcher $preferencesDir
+
+	# TODO: Also copy the catalogs!
+	# TODO: Declare the Deskbar menu symlink!
+}
diff --git a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.recipe b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.recipe
deleted file mode 100644
index bfc5da984..000000000
--- a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.recipe
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION="keymap switcher for Haiku." 
-HOMEPAGE="http://www.switcher.sourceforge.net" 
-SRC_URI="cvs://:pserver:anonymous@switcher.cvs.sourceforge.net:/cvsroot/switcher/keymapswitcher\(haiku\)"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-#CHECKSUM_MD5=""
-BUILD()
-{
-	cd keymapswitcher-1.2.7
-	make
-}
-
-INSTALL()
-{
-	cd keymapswitcher-1.2.7
-	make package
-	cp dist/*.zip ../..
-}
-
-COPYRIGHT="1999-2003 Stas Maximov"
-LICENSE="BSD (4-clause)"