diff -Nru libgetopt-java-1.0.13/debian/changelog libgetopt-java-1.0.13/debian/changelog
--- libgetopt-java-1.0.13/debian/changelog	2011-09-02 21:01:25.000000000 +0000
+++ libgetopt-java-1.0.13/debian/changelog	2011-10-28 18:36:43.000000000 +0000
@@ -1,3 +1,15 @@
+libgetopt-java (1.0.13-4) unstable; urgency=low
+
+  * Added build-arch and build-indep targets.
+  * Bumped Standards-Versions to 3.9.2 - no changes required.
+  * Compile javadoc during build instead of using the prebuilt one.
+    - Link javadoc against the system javadoc
+  * Split the javadoc to a separate package.
+    - New location: /usr/share/doc/libgetopt-java-doc/api
+  * Bumped debhelper compat 8.
+
+ -- Niels Thykier <niels@thykier.net>  Fri, 28 Oct 2011 20:36:40 +0200
+
 libgetopt-java (1.0.13-3) unstable; urgency=low
 
   * Team upload.
diff -Nru libgetopt-java-1.0.13/debian/compat libgetopt-java-1.0.13/debian/compat
--- libgetopt-java-1.0.13/debian/compat	2011-09-02 20:45:45.000000000 +0000
+++ libgetopt-java-1.0.13/debian/compat	2011-10-28 18:25:06.000000000 +0000
@@ -1 +1 @@
-7
+8
diff -Nru libgetopt-java-1.0.13/debian/control libgetopt-java-1.0.13/debian/control
--- libgetopt-java-1.0.13/debian/control	2011-09-02 21:01:25.000000000 +0000
+++ libgetopt-java-1.0.13/debian/control	2011-10-28 18:28:42.000000000 +0000
@@ -3,17 +3,34 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Michael Koch <konqueror@gmx.de>, Niels Thykier <niels@thykier.net>
-Build-Depends: debhelper (>= 7), default-jdk, maven-repo-helper
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 8), default-jdk, default-jdk-doc, javahelper (>= 0.33~),
+               maven-repo-helper
+Standards-Version: 3.9.2
 Homepage: http://www.urbanophile.com/arenn/hacking/download.html
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libgetopt-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libgetopt-java
 
 Package: libgetopt-java
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, ${java:Depends}
+Recommends: ${java:Recommends}
+Suggests: default-jdk-doc
 Description: GNU getopt - Java port
  The GNU Java getopt classes support short and long argument parsing 
  in a manner 100% compatible with the version of GNU getopt in glibc 
  2.0.6 with a mostly compatible programmer's interface as well. Note that 
  this is a port, not a new implementation.
+
+Package: libgetopt-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}, ${java:Depends}
+Recommends: ${java:Recommends}
+Description: GNU getopt - Java port (doc)
+ The GNU Java getopt classes support short and long argument parsing 
+ in a manner 100% compatible with the version of GNU getopt in glibc 
+ 2.0.6 with a mostly compatible programmer's interface as well. Note that 
+ this is a port, not a new implementation.
+ .
+ This package contains the Java Programming API docs.
+
diff -Nru libgetopt-java-1.0.13/debian/libgetopt-java-doc.javadoc libgetopt-java-1.0.13/debian/libgetopt-java-doc.javadoc
--- libgetopt-java-1.0.13/debian/libgetopt-java-doc.javadoc	1970-01-01 00:00:00.000000000 +0000
+++ libgetopt-java-1.0.13/debian/libgetopt-java-doc.javadoc	2011-10-28 18:25:06.000000000 +0000
@@ -0,0 +1 @@
+api
diff -Nru libgetopt-java-1.0.13/debian/rules libgetopt-java-1.0.13/debian/rules
--- libgetopt-java-1.0.13/debian/rules	2011-09-02 20:56:11.000000000 +0000
+++ libgetopt-java-1.0.13/debian/rules	2011-10-28 18:34:56.000000000 +0000
@@ -13,7 +13,11 @@
 export JAVAC=$(JAVA_HOME)/bin/javac
 export CLASSPATH=$(JAVA_HOME)/jre/lib/rt.jar:.
 
-build: build-stamp
+build: build-arch build-indep
+
+build-arch: build-stamp
+build-indep: build-stamp
+
 build-stamp:
 	dh_testdir
 	mkdir  classes
@@ -25,7 +29,7 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
-	rm -fr classes
+	rm -fr classes api
 	dh_clean
 
 install: build
@@ -34,8 +38,10 @@
 	dh_prep
 	dh_installdirs
 	(cd classes; ${JAR} cvf ../gnu-getopt.jar gnu)
-	mkdir -p debian/libgetopt-java/usr/share/doc/libgetopt-java/api
-	cp -a gnu/getopt/*.html debian/libgetopt-java/usr/share/doc/libgetopt-java/api
+	javadoc -link /usr/share/doc/default-jdk-doc/api -d api/ gnu/getopt/*.java
+	# Remove the javadoc of the example
+	[ ! -f api/GetoptDemo.html ] || rm -f api/GetoptDemo.html
+
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -48,6 +54,8 @@
 	mh_installpom -plibgetopt-java $(CURDIR)/debian/pom.xml
 	mh_installjar -plibgetopt-java -ngnu-getopt -l $(CURDIR)/debian/pom.xml \
 		$(CURDIR)/gnu-getopt.jar
+	jh_installjavadoc
+	jh_depends
 	dh_compress	
 	dh_link
 	dh_installdeb