diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 36a700b40..5062bcf7b 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_subdirectory(kmail)
+add_subdirectory(kmail2)
 add_subdirectory(akonadi_archivemail_agent)
 add_subdirectory(akonadi_sendlater_agent)
 add_subdirectory(akonadi_followupreminder_agent)
diff --git a/doc/kmail/CMakeLists.txt b/doc/kmail2/CMakeLists.txt
similarity index 60%
rename from doc/kmail/CMakeLists.txt
rename to doc/kmail2/CMakeLists.txt
index 381d075f0..7388d88c2 100644
--- a/doc/kmail/CMakeLists.txt
+++ b/doc/kmail2/CMakeLists.txt
@@ -1 +1 @@
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kmail)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kmail2)
diff --git a/doc/kmail/accountwizard.png b/doc/kmail2/accountwizard.png
similarity index 100%
rename from doc/kmail/accountwizard.png
rename to doc/kmail2/accountwizard.png
diff --git a/doc/kmail/aggregationtheme.png b/doc/kmail2/aggregationtheme.png
similarity index 100%
rename from doc/kmail/aggregationtheme.png
rename to doc/kmail2/aggregationtheme.png
diff --git a/doc/kmail/configure.docbook b/doc/kmail2/configure.docbook
similarity index 100%
rename from doc/kmail/configure.docbook
rename to doc/kmail2/configure.docbook
diff --git a/doc/kmail/configure.png b/doc/kmail2/configure.png
similarity index 100%
rename from doc/kmail/configure.png
rename to doc/kmail2/configure.png
diff --git a/doc/kmail/credits-and-licenses.docbook b/doc/kmail2/credits-and-licenses.docbook
similarity index 100%
rename from doc/kmail/credits-and-licenses.docbook
rename to doc/kmail2/credits-and-licenses.docbook
diff --git a/doc/kmail/faq.docbook b/doc/kmail2/faq.docbook
similarity index 100%
rename from doc/kmail/faq.docbook
rename to doc/kmail2/faq.docbook
diff --git a/doc/kmail/folder-example.png b/doc/kmail2/folder-example.png
similarity index 100%
rename from doc/kmail/folder-example.png
rename to doc/kmail2/folder-example.png
diff --git a/doc/kmail/folder-properties.png b/doc/kmail2/folder-properties.png
similarity index 100%
rename from doc/kmail/folder-properties.png
rename to doc/kmail2/folder-properties.png
diff --git a/doc/kmail/folderarchiveagent.png b/doc/kmail2/folderarchiveagent.png
similarity index 100%
rename from doc/kmail/folderarchiveagent.png
rename to doc/kmail2/folderarchiveagent.png
diff --git a/doc/kmail/getting-started.docbook b/doc/kmail2/getting-started.docbook
similarity index 100%
rename from doc/kmail/getting-started.docbook
rename to doc/kmail2/getting-started.docbook
diff --git a/doc/kmail/identitiesadvanced.png b/doc/kmail2/identitiesadvanced.png
similarity index 100%
rename from doc/kmail/identitiesadvanced.png
rename to doc/kmail2/identitiesadvanced.png
diff --git a/doc/kmail/identity.png b/doc/kmail2/identity.png
similarity index 100%
rename from doc/kmail/identity.png
rename to doc/kmail2/identity.png
diff --git a/doc/kmail/identitycryptography.png b/doc/kmail2/identitycryptography.png
similarity index 100%
rename from doc/kmail/identitycryptography.png
rename to doc/kmail2/identitycryptography.png
diff --git a/doc/kmail/identitygeneral.png b/doc/kmail2/identitygeneral.png
similarity index 100%
rename from doc/kmail/identitygeneral.png
rename to doc/kmail2/identitygeneral.png
diff --git a/doc/kmail/identitypicture.png b/doc/kmail2/identitypicture.png
similarity index 100%
rename from doc/kmail/identitypicture.png
rename to doc/kmail2/identitypicture.png
diff --git a/doc/kmail/identitysignature.png b/doc/kmail2/identitysignature.png
similarity index 100%
rename from doc/kmail/identitysignature.png
rename to doc/kmail2/identitysignature.png
diff --git a/doc/kmail/identitytemplate.png b/doc/kmail2/identitytemplate.png
similarity index 100%
rename from doc/kmail/identitytemplate.png
rename to doc/kmail2/identitytemplate.png
diff --git a/doc/kmail/index.docbook b/doc/kmail2/index.docbook
similarity index 100%
rename from doc/kmail/index.docbook
rename to doc/kmail2/index.docbook
diff --git a/doc/kmail/intro.docbook b/doc/kmail2/intro.docbook
similarity index 100%
rename from doc/kmail/intro.docbook
rename to doc/kmail2/intro.docbook
diff --git a/doc/kmail/kmailwelcome.png b/doc/kmail2/kmailwelcome.png
similarity index 100%
rename from doc/kmail/kmailwelcome.png
rename to doc/kmail2/kmailwelcome.png
diff --git a/doc/kmail/layout.png b/doc/kmail2/layout.png
similarity index 100%
rename from doc/kmail/layout.png
rename to doc/kmail2/layout.png
diff --git a/doc/kmail/mail-mark-important.png b/doc/kmail2/mail-mark-important.png
similarity index 100%
rename from doc/kmail/mail-mark-important.png
rename to doc/kmail2/mail-mark-important.png
diff --git a/doc/kmail/mail-mark-read.png b/doc/kmail2/mail-mark-read.png
similarity index 100%
rename from doc/kmail/mail-mark-read.png
rename to doc/kmail2/mail-mark-read.png
diff --git a/doc/kmail/mail-mark-task.png b/doc/kmail2/mail-mark-task.png
similarity index 100%
rename from doc/kmail/mail-mark-task.png
rename to doc/kmail2/mail-mark-task.png
diff --git a/doc/kmail/mail-mark-unread.png b/doc/kmail2/mail-mark-unread.png
similarity index 100%
rename from doc/kmail/mail-mark-unread.png
rename to doc/kmail2/mail-mark-unread.png
diff --git a/doc/kmail/mail-thread-ignored.png b/doc/kmail2/mail-thread-ignored.png
similarity index 100%
rename from doc/kmail/mail-thread-ignored.png
rename to doc/kmail2/mail-thread-ignored.png
diff --git a/doc/kmail/mail-thread-watch.png b/doc/kmail2/mail-thread-watch.png
similarity index 100%
rename from doc/kmail/mail-thread-watch.png
rename to doc/kmail2/mail-thread-watch.png
diff --git a/doc/kmail/menus.docbook b/doc/kmail2/menus.docbook
similarity index 100%
rename from doc/kmail/menus.docbook
rename to doc/kmail2/menus.docbook
diff --git a/doc/kmail/message.png b/doc/kmail2/message.png
similarity index 100%
rename from doc/kmail/message.png
rename to doc/kmail2/message.png
diff --git a/doc/kmail/messagelisttheme.png b/doc/kmail2/messagelisttheme.png
similarity index 100%
rename from doc/kmail/messagelisttheme.png
rename to doc/kmail2/messagelisttheme.png
diff --git a/doc/kmail/smile.png b/doc/kmail2/smile.png
similarity index 100%
rename from doc/kmail/smile.png
rename to doc/kmail2/smile.png
diff --git a/doc/kmail/troubleshooting.docbook b/doc/kmail2/troubleshooting.docbook
similarity index 100%
rename from doc/kmail/troubleshooting.docbook
rename to doc/kmail2/troubleshooting.docbook
diff --git a/doc/kmail/using-kmail.docbook b/doc/kmail2/using-kmail.docbook
similarity index 100%
rename from doc/kmail/using-kmail.docbook
rename to doc/kmail2/using-kmail.docbook
diff --git a/src/data/org.kde.kmail.appdata.xml b/src/data/org.kde.kmail.appdata.xml
index 126c6b970..8ed6b7e65 100644
--- a/src/data/org.kde.kmail.appdata.xml
+++ b/src/data/org.kde.kmail.appdata.xml
@@ -851,7 +851,7 @@
     </ul>
   </description>
   <url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?format=guided&amp;product=kmail</url>
-  <url type="help">http://docs.kde.org/stable/en/kdepim/kmail/index.html</url>
+  <url type="help">http://docs.kde.org/stable/en/kdepim/kmail2/index.html</url>
   <screenshots>
     <screenshot type="default">
       <image>http://kde.org/images/screenshots/kmail.png</image>
diff --git a/src/data/org.kde.kmail.desktop b/src/data/org.kde.kmail.desktop
index 50e078590..b0a92b6eb 100755
--- a/src/data/org.kde.kmail.desktop
+++ b/src/data/org.kde.kmail.desktop
@@ -76,7 +76,7 @@ Name[zh_TW]=郵件管理_KMail
 Type=Application
 Exec=kmail -qwindowtitle %c %u
 Icon=kmail
-X-DocPath=kmail/index.html
+X-DocPath=kmail2/index.html
 GenericName=Mail Client
 GenericName[af]=E-pos kliënt
 GenericName[ar]=عميل البريد