diff --git a/kdoctools/customization/entities/general.entities b/kdoctools/customization/entities/general.entities
index e51ebea6d..854189e8b 100644
--- a/kdoctools/customization/entities/general.entities
+++ b/kdoctools/customization/entities/general.entities
@@ -190,7 +190,7 @@
 <!ENTITY kde-http '<ulink url="http://www.kde.org/">http://www.kde.org/</ulink>'>
 <!ENTITY tde-http	'<ulink url="http://www.trinitydesktop.org/">http://www.trinitydesktop.org/</ulink>'>
 <!ENTITY kde-ftp	'<ulink url="ftp://ftp.kde.org/pub/kde/">ftp://ftp.kde.org/pub/kde/</ulink>'>
-<!ENTITY kdepasswd	"<application>kdepasswd</application>">
+<!ENTITY tdepasswd	"<application>tdepasswd</application>">
 <!ENTITY tdeprint       "<application>TDEPrint</application>">
 <!ENTITY kdesktop	"<application>KDesktop</application>">
 <!ENTITY kdessh	"<application>kdessh</application>">
diff --git a/kdoctools/customization/obsolete/general.entities b/kdoctools/customization/obsolete/general.entities
index 518ba097b..f5e276860 100644
--- a/kdoctools/customization/obsolete/general.entities
+++ b/kdoctools/customization/obsolete/general.entities
@@ -188,7 +188,7 @@
 <!ENTITY kde-http '<ulink url="http://www.kde.org/">http://www.kde.org/</ulink>'>
 <!ENTITY tde-http	'<ulink url="http://www.trinitydesktop.org/">http://www.trinitydesktop.org/</ulink>'>
 <!ENTITY kde-ftp	'<ulink url="ftp://ftp.kde.org/pub/kde/">ftp://ftp.kde.org/pub/kde/</ulink>'>
-<!ENTITY kdepasswd	"<application>kdepasswd</application>">
+<!ENTITY tdepasswd	"<application>tdepasswd</application>">
 <!ENTITY kdesktop	"<application>KDesktop</application>">
 <!ENTITY kdessh	"<application>kdessh</application>">
 <!ENTITY tdesu	"<application>TDE su</application>">
diff --git a/tdecore/kdebug.areas b/tdecore/kdebug.areas
index 2221c5d80..c61e07b06 100644
--- a/tdecore/kdebug.areas
+++ b/tdecore/kdebug.areas
@@ -105,7 +105,7 @@
 # tdeutils
 1501        khexedit (tdeutils)
 1511        kdessh (tdeutils)
-1512        kdepasswd (tdeutils)
+1512        tdepasswd (tdebase)
 1601        ark (tdeutils)
 1901        kfind
 1902        kfind (KfindWindow::updateResults)
diff --git a/tdeui/kdepackages.h b/tdeui/kdepackages.h
index e4bc551aa..37d33ba09 100644
--- a/tdeui/kdepackages.h
+++ b/tdeui/kdepackages.h
@@ -436,7 +436,7 @@ const char * const packages[] = {
 "kdelirc/irkick",
 "kdelirc/kcmlirc",
 "tdemultimedia",
-"kdepasswd",
+"tdepasswd",
 "tdepimlibs",
 "tdepimlibs/gpgme++",
 "tdepimlibs/tdeabc",