diff --git a/TODO b/TODO
index 0e34338..f3d79e9 100644
--- a/TODO
+++ b/TODO
@@ -6,10 +6,16 @@
 
 * Add possbility to search multiple LDAP hosts (2005/12/07 bklang)
 
-* Add support for DNS TXT records (2005/12/08 bklang)
+* Document support for each DNS record type (2005/12/08 bklang)
 
 * Document scripts/* functionality (2005/12/08 bklang)
 
+* Modify scripts/data2ldap.pl to merge multiple A records for a single
+  host in data file into single object in LDAP (2005/12/08 bklang)
+
+* Clean up DNS TXT support: text current requires a trailing '.', probably
+  should introduce a new attribute for DNS TXT so it is unambiguous
+
 --- Old TODOs from Jacob ---
 Version ?.?.? (next)
 + Make ldap2dns behave like a secondary nameserver by storing
diff --git a/scripts/data2ldap.pl b/scripts/data2ldap.pl
index 8129f32..b308db8 100644
--- a/scripts/data2ldap.pl
+++ b/scripts/data2ldap.pl
@@ -119,7 +119,7 @@ LINE: while(<DATA>) {
             print $outfh "cn: $domain\n";
             print $outfh "dnszonename: $domain\n";
             print $outfh "dnszonemaster: $x\n";
-            print $outfh "dnsadminmailbox: hostmaster\@$domain\n";
+            print $outfh "dnsadminmailbox: hostmaster.$domain\n";
             if (defined($ttl)) { print $outfh "dnsttl: $ttl\n"; }
             if (defined($timestamp)) { print $outfh "dnstimestamp: $timestamp\n"; }
             if (defined($loc)) { print $outfh "dnslocation: $loc\n"; }