diff --git a/debian/i2p-doc.doc-base b/debian/i2p-doc.doc-base
index 2aacc067891c133bcc2e4e90590cec16178703ff..a467b23ed1aaff6b05f72bb49768e67ef7570f4b 100644
--- a/debian/i2p-doc.doc-base
+++ b/debian/i2p-doc.doc-base
@@ -1,9 +1,9 @@
 Document: i2p-doc
 Title: API JavaDoc for i2p-doc
-Author: 
+Author: I2P Developers
 Abstract: This the API JavaDoc for i2p-doc
 Section: Programming/Java
 
 Format: HTML
-Index: /usr/share/doc/i2p-doc/api
+Index: /usr/share/doc/i2p-doc/api/index.html
 Files: /usr/share/doc/i2p-doc/api/*.html
diff --git a/debian/i2p-doc.install b/debian/i2p-doc.install
index fb5b592178ca6a73c167b57c8b721d9b17d3bcaf..663692ad77b00ca97abb88ef25d14182573462de 100644
--- a/debian/i2p-doc.install
+++ b/debian/i2p-doc.install
@@ -1 +1 @@
-build/api usr/share/doc/i2p-doc
+build/javadoc usr/share/i2p/docs
diff --git a/debian/i2p-doc.links b/debian/i2p-doc.links
new file mode 100644
index 0000000000000000000000000000000000000000..a63164a43fa986324ffddb867aad2d4ee30e83b0
--- /dev/null
+++ b/debian/i2p-doc.links
@@ -0,0 +1 @@
+usr/share/i2p/docs/javadoc usr/share/doc/i2p-doc/api
diff --git a/debian/rules b/debian/rules
index 5e67b037e26985313868300c06816421bc7deee0..f3c48560eaa53665728f287d559aeedf7037a8d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,7 +52,6 @@ build-indep:
 	#[ -r jetty/jetty-5.1.15.tgz ] && ln -sf $(CURDIR)/jetty/jetty-5.1.15.tgz $(CURDIR)/apps/jetty/jetty-5.1.15.tgz
 	ant preppkg-linux javadoc
 	echo router.updateDisabled=true > $(I2P)/router.config
-	mv build/javadoc build/api
 	mv $(I2P)/runplain.sh $(I2P)/i2prouter-nowrapper
 	-cp -fv /usr/share/tor/geoip $(CURDIR)/pkg-temp/geoip/geoip.txt