diff --git a/doc/Changelog b/doc/Changelog
index d8bf8ac26..2c333fa86 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,6 @@
 14 April 2008: Wouter
 	- got update for parseunbound.pl statistics script from Kai Storbeck.
+	- tpkg tests for udp wait list.
 
 11 April 2008: Wouter
 	- random port selection out of the configged ports.
diff --git a/doc/TODO b/doc/TODO
index 4f2709b37..36c656a29 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -39,3 +39,10 @@ o SIG(0) and TSIG.
 o support OPT record placement on recv anywhere in the additional section. 
 o add local-file: config with authority features.
 o (option) to make local-data answers be secure for libunbound (default=no)
+o (option) to make chroot: copy all needed files into jail (or make jail)
+	perhaps also print reminder to link /dev/random and sysloghack.
+o (option) for extended statistics. If enabled (not by default) collect print
+	rcode, uptime, spoofnearmisses, cache size, qtype, 
+	bits(RD, CD, DO, EDNS-present, AD)query, (Secure, Bogus)reply.
+o overhaul outside-network servicedquery to merge with udpwait and tcpwait,
+  to make timers in servicedquery independent of udpwait queues.
diff --git a/testdata/fwd_oneport.tpkg b/testdata/fwd_oneport.tpkg
new file mode 100644
index 000000000..29981b280
Binary files /dev/null and b/testdata/fwd_oneport.tpkg differ
diff --git a/testdata/fwd_three_service.tpkg b/testdata/fwd_three_service.tpkg
index f09ee99d1..d7e21b3eb 100644
Binary files a/testdata/fwd_three_service.tpkg and b/testdata/fwd_three_service.tpkg differ
diff --git a/testdata/fwd_udptmout.tpkg b/testdata/fwd_udptmout.tpkg
new file mode 100644
index 000000000..197758d45
Binary files /dev/null and b/testdata/fwd_udptmout.tpkg differ
diff --git a/testdata/fwd_waitudp.tpkg b/testdata/fwd_waitudp.tpkg
new file mode 100644
index 000000000..4478606d2
Binary files /dev/null and b/testdata/fwd_waitudp.tpkg differ