diff --git a/kde-base/kdm/Manifest b/kde-base/kdm/Manifest
index d3156146e..4b98f5904 100644
--- a/kde-base/kdm/Manifest
+++ b/kde-base/kdm/Manifest
@@ -1,4 +1,6 @@
 AUX kdebase-4.0.2-pam-optional.patch 979 RMD160 abdb7293c02507dfd0a032e72f3e449405b6d8a0 SHA1 33e2f936f0548f9b19fe541c0f71db06f9daaf63 SHA256 efa4e0132687dbaa68ab5c8a5911c4a08b5d4e9eb4d2a04879f765b8e44ba9ea
 AUX kdm-4.2.0-guistyle.patch 491 RMD160 c94a389e49361631c5b051ba0d481fc4a72fd985 SHA1 2d9c2f4a8f0d2b063ab419f380254ed9cd165728 SHA256 9f368ad8b2e2a307b57a84d5ad47d00f644a9bfcfe5ee2d1f2db8a57e7b15e25
 DIST kdebase-workspace-4.2.0.tar.bz2 50724381 RMD160 752e727aaf0010e362f3c77190584fa8c6bd4761 SHA1 351eae9401ac6fb990950d1a5120505475abef05 SHA256 e5c550af7d655d62e37c51667f264b53eb9785166f3567960d91acd37b6f902b
+DIST kdebase-workspace-4.2.1.tar.bz2 50777207 RMD160 fe1debd87fb62c652925f6709905d0cf416b39c4 SHA1 412b8a6778d5c71a366c054b0136edae309bbef0 SHA256 fa8165cb1c64046c4a659cd69962cda79093453f72bf4fb6df869a34dfb87f98
 EBUILD kdm-4.2.0-r9.ebuild 2494 RMD160 21e84006321dc7df8ea869f1288018966f6e2ae0 SHA1 2419e68df4076a4b088e1aa4245f597f6e6eb10a SHA256 374174632bb6c14c98a66d271e491ee16569c7ed15f3d9813fc97e2ff8cb6e0f
+EBUILD kdm-4.2.1-r9.ebuild 2512 RMD160 97cbbaccf9750de329232e9c942759e46394d213 SHA1 db410d5814d621800d5ddae66e10097b46ea681c SHA256 816bc03e276aba8233373d7200a7548799e5d668703f0a530b8b29951ed6492d
diff --git a/kde-base/kdm/kdm-4.2.1-r9.ebuild b/kde-base/kdm/kdm-4.2.1-r9.ebuild
new file mode 100644
index 000000000..1fe3fb052
--- /dev/null
+++ b/kde-base/kdm/kdm-4.2.1-r9.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.2.1.ebuild,v 1.3 2009/03/08 13:39:58 scarabeus Exp $
+
+EAPI="2"
+
+KMNAME="kdebase-workspace"
+inherit kde4-meta
+
+DESCRIPTION="KDE login manager, similar to xdm and gdm"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="consolekit debug kerberos pam"
+
+DEPEND="
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXtst
+	consolekit? (
+		>=sys-apps/dbus-1.0.2
+		sys-auth/consolekit
+	)
+	kerberos? ( virtual/krb5 )
+	pam? (
+		>=kde-base/kcheckpass-${PV}:${SLOT}[kdeprefix=]
+		virtual/pam
+	)
+"
+RDEPEND="${DEPEND}
+	>=kde-base/kdepasswd-${PV}:${SLOT}[kdeprefix=]
+	>=x11-apps/xinit-1.0.5-r2
+	x11-apps/xmessage
+"
+
+KMEXTRACTONLY="
+	kcontrol/kdm/
+"
+KMEXTRA="
+	libs/kdm/
+"
+
+PATCHES=("${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
+         "${FILESDIR}/kdm-4.2.0-guistyle.patch")
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		$(use kerberos && echo "-DKDE4_KRB5AUTH=ON" || echo "-DKDE4_KRB5AUTH=OFF")
+		$(cmake-utils_use_with pam PAM)
+		$(cmake-utils_use_with consolekit CkConnector)"
+
+	kde4-meta_src_configure
+}
+
+src_install() {
+	export GENKDMCONF_FLAGS="--no-old --no-backup"
+
+	kde4-meta_src_install
+
+	# Customize the kdmrc configuration
+	sed -i -e "s:^.*SessionsDirs=.*$:#&\nSessionsDirs=/usr/share/xsessions:" \
+		"${D}"/${PREFIX}/share/config/kdm/kdmrc \
+		|| die "Failed to set SessionsDirs correctly."
+
+	# Don't install empty dir
+	rmdir "${D}${KDEDIR}"/share/config/kdm/sessions
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	# Set the default kdm face icon if it's not already set by the system admin
+	# because this is user-overrideable in that way, it's not in src_install
+	if [[ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" ]];	then
+		mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces"
+		cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/default1.png" \
+			"${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon"
+	fi
+	if [[ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" ]]; then
+		mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces"
+		cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/root1.png" \
+			"${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon"
+	fi
+
+	if use consolekit; then
+		echo
+		elog "You have compiled 'kdm' with consolekit support. If you want to use kdm,"
+		elog "make sure consolekit daemon is running and started at login time"
+		elog
+		elog "rc-update add consolekit default && /etc/init.d/consolekit start"
+		echo
+	fi
+}