diff --git a/ChangeLog b/ChangeLog
index 0d93fe5f..0c9c56e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-08-09  Anders Carlsson  <andersca@codefactory.se>
+
+	* doc/TODO:
+	* doc/busconfig.dtd:
+	Add busconfig DTD.
+	
 2003-08-09  Anders Carlsson  <andersca@codefactory.se>
 
 	* doc/dbus-specification.sgml:
diff --git a/doc/TODO b/doc/TODO
index 75ba7d86..0e56e1e7 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -48,8 +48,6 @@
    after the message bus has processed your message but before the service has replied, 
    it would be nice if the message bus sent you an error reply.
 
- - write a DTD for the dbus-daemon-1 configuration file
-
  - build and install the Doxygen manual in Makefile when --enable-docs
 
  - if you send the same message to multiple connections, the serial number 
diff --git a/doc/busconfig.dtd b/doc/busconfig.dtd
new file mode 100644
index 00000000..97c0b82e
--- /dev/null
+++ b/doc/busconfig.dtd
@@ -0,0 +1,52 @@
+<!ELEMENT busconfig (user |
+                     type |
+                     fork |
+                     listen | 
+                     pidfile |
+                     includedir |
+                     servicedir |
+                     auth |
+                     include |
+                     policy |
+                     limit)*>
+
+<!ELEMENT user (#PCDATA)>
+<!ELEMENT listen (#PCDATA)>
+<!ELEMENT includedir (#PCDATA)>
+<!ELEMENT servicedir (#PCDATA)>
+<!ELEMENT auth (#PCDATA)>
+<!ELEMENT type (#PCDATA)>
+<!ELEMENT pidfile (#PCDATA)>
+<!ELEMENT fork EMPTY>
+
+<!ELEMENT include (#PCDATA)>
+<!ATTLIST include 
+          ignore_missing (yes|no) "yes">
+
+<!ELEMENT policy (allow|deny)*>
+<!ATTLIST policy 
+          context (default|mandatory) #IMPLIED
+          user CDATA #IMPLIED
+          group CDATA #IMPLIED>
+
+<!ELEMENT allow EMPTY>
+<!ATTLIST allow 
+          user CDATA #IMPLIED
+          send CDATA #IMPLIED
+          receive CDATA #IMPLIED
+          own CDATA #IMPLIED
+          send_to CDATA #IMPLIED
+          receive_from CDATA #IMPLIED>
+
+<!ELEMENT deny EMPTY>
+<!ATTLIST deny
+          user CDATA #IMPLIED
+          send CDATA #IMPLIED
+          receive CDATA #IMPLIED
+          own CDATA #IMPLIED
+          send_to CDATA #IMPLIED
+          receive_from CDATA #IMPLIED>
+
+<!ELEMENT limit (#PCDATA)>
+<!ATTLIST limit name CDATA #REQUIRED>
+