diff -Nru tftp-hpa-5.1/debian/changelog tftp-hpa-5.1/debian/changelog
--- tftp-hpa-5.1/debian/changelog	2011-08-08 16:33:01.000000000 +0700
+++ tftp-hpa-5.1/debian/changelog	2011-09-06 18:56:43.000000000 +0700
@@ -1,3 +1,22 @@
+tftp-hpa (5.1-2ubuntu1) oneiric; urgency=low
+
+  * Merge from debian unstable (LP: #842585). Remaining changes:
+    - Set /var/lib/tftpboot by default instead of /srv/tftp.
+    - Decrease priority of tftp path from high to low.
+    - debian/rules, debain/tftpd-hpa.upstart: Convert to usptart (LP: #522509)
+    - debian/patches/04-use-memcpy-for-header.patch: fix FORTIFY-detected
+      potential memory corruption (LP: #691345)
+
+ -- Mahyuddin Susanto <udienz@ubuntu.com>  Tue, 06 Sep 2011 18:55:40 +0700
+
+tftp-hpa (5.1-2) unstable; urgency=low
+
+  * Applying patch from Chris Lamb <lamby@debian.org> to correct wrong
+    variable used in tftpd-hpa postrm that lead to not removing the tftp
+    server directory on purge (Closes: #636152).
+
+ -- Daniel Baumann <daniel.baumann@progress-technologies.net>  Sun, 07 Aug 2011 16:43:58 +0200
+
 tftp-hpa (5.1-1ubuntu1) oneiric; urgency=low
 
   * Merge from debian unstable.  Remaining changes:
diff -Nru tftp-hpa-5.1/debian/tftpd-hpa.postrm tftp-hpa-5.1/debian/tftpd-hpa.postrm
--- tftp-hpa-5.1/debian/tftpd-hpa.postrm	2011-07-12 00:51:11.000000000 +0700
+++ tftp-hpa-5.1/debian/tftpd-hpa.postrm	2011-08-11 21:14:51.000000000 +0700
@@ -10,7 +10,7 @@
 		fi
 
 		TFTP_USERNAME="${TFTP_USERNAME:-tftp}"
-		TFTP_DIRECTORY="${TFTP_USERNAME:-/srv/tftp}"
+		TFTP_DIRECTORY="${TFTP_DIRECTORY:-/srv/tftp}"
 
 		if [ -x /usr/sbin/deluser ]
 		then