diff --git a/TODO b/TODO
index 2d40c5b..7377ce1 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,5 @@
 - Create missing manpages (for all commands).
-- Document ubuntutools Python modules.
-- Add the process-interdiff script to ubuntu-dev-tools.
 - Modify 404main to use the more robust python-apt module.
+- Use the short version of the GPL license in all scripts.
+- Ask all authors who have used GPL if they are happy with using "or any later"
+  versions of the license.
diff --git a/debian/changelog b/debian/changelog
index fe0b044..0506712 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
-ubuntu-dev-tools (0.35) intrepid; urgency=low
+ubuntu-dev-tools (0.36) intrepid; urgency=low
 
+    [ Jonathan Patrick Davies ]
+    * doc/what-patch.1: Written and added.
+
+ -- Jonathan Patrick Davies <jpds@ubuntu.com>  Sun 10 Aug 2008 11:02:55 +0100
+ubuntu-dev-tools (0.35) intrepid; urgency=low
   [ Siegfried-Angel Gevatter Pujals ]
   * doc/update-maintainer.1:
      - Remove the reference to the --no-changelog option from the manpage.
diff --git a/doc/what-patch.1 b/doc/what-patch.1
new file mode 100644
index 0000000..f15f02d
--- /dev/null
+++ b/doc/what-patch.1
@@ -0,0 +1,42 @@
+.TH WHAT-PATCH "1" "10 August 2008" "ubuntu-dev-tools"
+.SH NAME
+what-patch \- detects which patch system a Debian package uses.
+
+.SH SYNOPSIS
+
+.B what-patch [\-h] [\-v]
+
+.SH DESCRIPTION
+.PP 
+\fBwhat-patch\fR examines the debian/rules file to determine which patch
+system the Debian package is using.
+
+.PP
+\fBwhat-patch\fR should be run from the root directory of the Debian source
+package.
+
+.SH OPTIONS
+.PP
+Listed below are the command line options for what-patch:
+.TP
+.B \-h or \-\-help
+Display a help message and exit.
+.TP
+.B \-v
+Enable verbose mode. This shall include the listing of any files modified
+outside for the debian/ directory and report any addition details about the
+patch system if available.
+
+.SH AUTHOR
+.PP
+\fBwhat-patch\fR was written by Kees Cook <kees@ubuntu.com>, Siegfried-A.
+Gevatter <rainct@ubuntu.com>, and Daniel Hahler <ubuntu@thequod.de>, among
+others. This manual page was written by Jonathan Patrick Davies <jpds@ubuntu.com>.
+
+.SH SEE ALSO 
+.PP
+The Ubuntu MOTU team has some documentation about patch systems at the Ubuntu
+wiki: \fBhttps://wiki.ubuntu.com/PackagingGuide/PatchSystems\fR
+
+.PP
+.BR cdbs-edit-patch (1), dbs-edit-patch (1), patch-edit-patch (1)