diff --git a/Makefile b/Makefile
index 5521fa640..d0f7ac214 100644
--- a/Makefile
+++ b/Makefile
@@ -301,6 +301,6 @@ customupdate: all
 	cp -r git-rev resources $(INSTALL_DIR)
 	cp -rpL frontend $(INSTALL_DIR)
 	mkdir $(INSTALL_DIR)/fonts/host
-	zip -9 -r kindlepdfviewer-$(VERSION).zip $(INSTALL_DIR) launchpad/ kite/
+	zip -9 -r kindlepdfviewer-$(VERSION).zip $(INSTALL_DIR) launchpad/ extensions/
 	rm -rf $(INSTALL_DIR)
 	@echo "copy kindlepdfviewer-$(VERSION).zip to /mnt/us/customupdates and install with shift+shift+I"
diff --git a/extensions/kpdf/README.txt b/extensions/kpdf/README.txt
new file mode 100644
index 000000000..d56e92cc9
--- /dev/null
+++ b/extensions/kpdf/README.txt
@@ -0,0 +1,23 @@
+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/extensions/kpdf/config.xml b/extensions/kpdf/config.xml
new file mode 100644
index 000000000..1d13b8853
--- /dev/null
+++ b/extensions/kpdf/config.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extension>
+	<information>
+		<name>KPDF</name>
+		<version>0.0</version>
+		<author>Hawhill</author>
+		<id>helper</id>
+	</information>
+	<menus>
+		<menu type="json" dynamic="true">menu.json</menu>
+	</menus>
+</extension>
diff --git a/extensions/kpdf/menu.json b/extensions/kpdf/menu.json
new file mode 100644
index 000000000..8b7741aa3
--- /dev/null
+++ b/extensions/kpdf/menu.json
@@ -0,0 +1,12 @@
+{
+	"items": [
+		{
+		"name": "KPDF",
+		"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"}
+		]
+		}
+	]
+}
diff --git a/kite/KPDFviewer (last file) b/kite/KPDFviewer (last file)
deleted file mode 100755
index de0c410d9..000000000
--- a/kite/KPDFviewer (last file)	
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-/mnt/us/kindlepdfviewer/kpdf.sh
diff --git a/kite/KPDFviewer File Manager b/kite/KPDFviewer File Manager
deleted file mode 100755
index f5f935234..000000000
--- a/kite/KPDFviewer File Manager	
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-/mnt/us/kindlepdfviewer/kpdf.sh /mnt/us/documents