diff --git a/extensions/koreader/README.txt b/extensions/koreader/README.txt
new file mode 100644
index 000000000..1c3763f40
--- /dev/null
+++ b/extensions/koreader/README.txt
@@ -0,0 +1,22 @@
+TITLE: koreader
+
+CONTAINS: KUAL files for installation in /mnt/us/extensions/ 
+
+REF: Main KUAL thread http://www.mobileread.com/forums/showthread.php?t=203326
+
+UPSTREAM SOURCE: https://github.com/hwhw/koreader
+
+SUPPORTS: 
+DX No
+K3 No
+K4 No
+Touch Yes
+PW Yes
+
+REQUIRES: koreader
+
+ARCHIVAL LINK: 
+
+ORIGINAL AUTHOR: koreader development team
+
+NOTES: this is the successor of KindlePDFviewer for devices with touch input support. Support for keyboard input is to be done, use the legacy KindlePDFviewer or Librerator for this. Report issues and bugs on github.
diff --git a/extensions/kpdf/config.xml b/extensions/koreader/config.xml
similarity index 77%
rename from extensions/kpdf/config.xml
rename to extensions/koreader/config.xml
index 1d13b8853..cf18e6b4c 100644
--- a/extensions/kpdf/config.xml
+++ b/extensions/koreader/config.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension>
 	<information>
-		<name>KPDF</name>
+		<name>Koreader</name>
 		<version>0.0</version>
-		<author>Hawhill</author>
+		<author>Koreader dev team</author>
 		<id>helper</id>
 	</information>
 	<menus>
diff --git a/extensions/kpdf/menu.json b/extensions/koreader/menu.json
similarity index 63%
rename from extensions/kpdf/menu.json
rename to extensions/koreader/menu.json
index 8b7741aa3..02ee707ff 100644
--- a/extensions/kpdf/menu.json
+++ b/extensions/koreader/menu.json
@@ -1,11 +1,11 @@
 {
 	"items": [
 		{
-		"name": "KPDF",
+		"name": "Koreader",
 		"priority": 0,
 		"items": [
-			{"name": "Start in documents", "priority": 1, "action": "/mnt/us/kindlepdfviewer/kpdf.sh", "params": "/mnt/us/documents"},
-			{"name": "Open last document", "priority": 2, "action": "/mnt/us/kindlepdfviewer/kpdf.sh"}
+			{"name": "Start in documents", "priority": 1, "action": "/mnt/us/koreader/koreader.sh", "params": "/mnt/us/documents"},
+			{"name": "Open last document", "priority": 2, "action": "/mnt/us/koreader/koreader.sh"}
 		]
 		}
 	]
diff --git a/extensions/kpdf/README.txt b/extensions/kpdf/README.txt
deleted file mode 100644
index d56e92cc9..000000000
--- a/extensions/kpdf/README.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-TITLE: kindlepdfviewer
-
-CONTAINS: KUAL files for installation in /mnt/us/extensions/ 
-
-REF: Main KUAL thread http://www.mobileread.com/forums/showthread.php?t=203326
-
-UPSTREAM SOURCE: https://github.com/hwhw/kindlepdfviewer
-
-SUPPORTS: 
-DX Yes ( All Revisions )
-K3 Yes ( All Revisions )
-K4 Yes ( All Revisions )
-Touch (check github and threads for support information)
-PW (check github and threads for support information)
-
-REQUIRES: KindlePDFviewer http://www.mobileread.com/forums/showthread.php?t=157047
-
-ARCHIVAL LINK: http://www.mobileread.com/forums/showpost.php?p=2406316&postcount=5
-
-ORIGINAL AUTHOR: Hawhill, See GIT for subsequent contributors listing
-
-NOTES: Touchscreen support for the Touch and PW is in progress
-check github and threads for support information
diff --git a/kpdf.sh b/koreader.sh
similarity index 100%
rename from kpdf.sh
rename to koreader.sh
diff --git a/launchpad/koreader.ini b/launchpad/koreader.ini
new file mode 100755
index 000000000..e543cee7e
--- /dev/null
+++ b/launchpad/koreader.ini
@@ -0,0 +1,11 @@
+[Actions]
+# start koreader with filebrowser in /mnt/us/documents
+P D = !/mnt/us/koreader/koreader.sh /mnt/us/documents
+# start koreader with last document
+P P = !/mnt/us/koreader/koreader.sh
+# start koreader without framework in /mnt/us/documents
+P K = !/mnt/us/koreader/koreader.sh --framework_stop /mnt/us/documents
+# start koreader without framework on last read document
+P L = !/mnt/us/koreader/koreader.sh --framework_stop
+# restart amazon framework - when it got irritated
+P R = !/etc/init.d/framework restart
diff --git a/launchpad/kpdf.ini b/launchpad/kpdf.ini
deleted file mode 100755
index 53be1fc3f..000000000
--- a/launchpad/kpdf.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[Actions]
-# start kindlepdfviewer with filebrowser in /mnt/us/documents
-P D = !/mnt/us/kindlepdfviewer/kpdf.sh /mnt/us/documents
-# start kindlepdfviewer with last document
-P P = !/mnt/us/kindlepdfviewer/kpdf.sh
-# start kindlepdfviewer without framework in /mnt/us/documents
-P K = !/mnt/us/kindlepdfviewer/kpdf.sh --framework_stop /mnt/us/documents
-# start kindlepdfviewer without framework on last read document
-P L = !/mnt/us/kindlepdfviewer/kpdf.sh --framework_stop
-# restart amazon framework - when it got irritated
-P R = !/etc/init.d/framework restart