diff --git a/ChangeLog b/ChangeLog
index d3b6864..1e474d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,7 @@ Version 0.3.6 (latest)
 + Altered default behavior (via ldap2dns-conf) to run ldap2dns as non-root
 + Updated FAQ
 + Deprecated askldap.c and askldap.h
++ Created TODO file
 
 Version 0.3.5 - 2005/11/30
 + Added support for DNS SRV records
diff --git a/TODO b/TODO
new file mode 100644
index 0000000..a26501e
--- /dev/null
+++ b/TODO
@@ -0,0 +1,2 @@
+* Add support for configuring basedn, binddn, bindpw, and execute command via
+  environment variables. (2005/12/07 bklang)
diff --git a/ldap2dns.spec.in b/ldap2dns.spec.in
index 7770418..de9a046 100644
--- a/ldap2dns.spec.in
+++ b/ldap2dns.spec.in
@@ -61,7 +61,18 @@ make INSTALL_PREFIX=$RPM_BUILD_ROOT install
 %doc import.pl
 %config /etc/openldap/schema/ldap2dns.schema
 
+%pre
+/usr/sbin/groupadd -g 161 -r ldap2dns >/dev/null 2>/dev/null || :
+/usr/sbin/groupadd -g 162 -r l2dnslog >/dev/null 2>/dev/null || :
+/usr/sbin/useradd -r -o -g ldap2dns -u 161 -c "LDAP2DNS Daemon" \
+                  -s /bin/false -d /nonexistant ldap2dns 2> /dev/null || :
+
+/usr/sbin/useradd -r -o -g l2dnslog -u 162 -c "LDAP2DNS Logging Daemon" \
+                  -s /bin/false -d /nonexistant l2dnslog 2> /dev/null || :
+
 %changelog
+* Wed Dec 07 2005 Ben Klang <ben@alkaloid.net>
+- Added user and group creation
 * Sun Dec 04 2005 Ben Klang <ben@alkaloid.net>
 - Updated Specfile to version 0.3.6
 * Wed Dec 06 2000 Jacob Rief <jacob.rief@tiscover.com>