diff --git a/ChangeLog b/ChangeLog
index 1e474d9..dbf1e77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,3 @@
-Version ?.?.? (next)
-+ Make ldap2dns behave like a secondary nameserver by storing
-  the serial number, expire, refresh, retry and minimum values 
-  in a record.
-
 Version 0.3.6 (latest)
 + New maintainer: Ben Klang <ben@alkaloid.net>
 + Fixed bug with duplicate OIDs in dns.schema from partially applied patch
@@ -21,6 +16,9 @@ Version 0.3.6 (latest)
 + Updated FAQ
 + Deprecated askldap.c and askldap.h
 + Created TODO file
++ Added TinyDNS data file import script (scripts/data2ldap.pl)
++ Moved AXFR import script (formerly import.pl) to scripts/axfr2ldap.pl
++ Deprecated export-ldap.pl (Possibly old ldap2dns 0.2->0.3 upgrade script?)
 
 Version 0.3.5 - 2005/11/30
 + Added support for DNS SRV records
diff --git a/TODO b/TODO
index f5a4ffd..0e34338 100644
--- a/TODO
+++ b/TODO
@@ -5,3 +5,14 @@
   DNS search base DN, possibly more) (2005/12/07 bklang)
 
 * Add possbility to search multiple LDAP hosts (2005/12/07 bklang)
+
+* Add support for DNS TXT records (2005/12/08 bklang)
+
+* Document scripts/* functionality (2005/12/08 bklang)
+
+--- Old TODOs from Jacob ---
+Version ?.?.? (next)
++ Make ldap2dns behave like a secondary nameserver by storing
+  the serial number, expire, refresh, retry and minimum values
+  in a record.
+
diff --git a/export-ldap2dns.pl b/deprecated/export-ldap2dns.pl
similarity index 100%
rename from export-ldap2dns.pl
rename to deprecated/export-ldap2dns.pl
diff --git a/import.pl b/scripts/axfr2ldap.pl
similarity index 100%
rename from import.pl
rename to scripts/axfr2ldap.pl
diff --git a/data2ldap.pl b/scripts/data2ldap.pl
similarity index 100%
rename from data2ldap.pl
rename to scripts/data2ldap.pl