--- a/bitten/master.py
+++ b/bitten/master.py
@@ -153,6 +153,7 @@
                     self.props[SlaveInfo.OS_NAME] = child.gettext()
                     self.props[SlaveInfo.OS_FAMILY] = child.attr.get('family')
                     self.props[SlaveInfo.OS_VERSION] = child.attr.get('version')
+            self.props[SlaveInfo.IP_ADDRESS] = self.session.addr[0]
 
             self.name = elem.attr['name']
             self.master.slaves[self.name] = self
@@ -223,7 +224,7 @@
                         logging.warning('Step failed: %s', elem.gettext())
                     self.steps.append((elem.attr['id'],
                                        elem.attr['result']))
-                elif elem.name == 'abort':
+                elif elem.name == 'aborted':
                     logging.info('Slave "%s" aborted build', self.name)
                     build.slave = None
                     build.started = 0

--- a/bitten/slave.py
+++ b/bitten/slave.py
@@ -160,7 +160,7 @@
             self.channel.send_nul(msgno)
 
         except (KeyboardInterrupt, SystemExit), e:
-            xml = xmlio.Element('abort')['Build cancelled']
+            xml = xmlio.Element('aborted')['Build cancelled']
             self.channel.send_ans(msgno, beep.MIMEMessage(xml))
             self.channel.send_nul(msgno)
 

--- a/doc/orchestration.dtd
+++ b/doc/orchestration.dtd
@@ -1,22 +1,67 @@
-<!-- DTD for the Bitten build orchestration BEEP profile. -->
+<!--
+DTD for the Bitten build orchestration BEEP profile.
+-->
 
+<!--
+Slave registration.
+-->
 <!ELEMENT register    (platform, os)>
 <!ATTLIST register
           name        CDATA             #REQUIRED
           maintainer  CDATA             #IMPLIED>
 
+<!--
+Platform/machine information for slave registration.
+-->
 <!ELEMENT platform    #PCDATA>
+<!ATTLIST os
+          processor   CDATA             #IMPLIED>
 
+<!--
+Operating system information for slave registration.
+-->
 <!ELEMENT os          #PCDATA>
 <!ATTLIST os
           family      CDATA             #REQUIRED
           version     CDATA             #IMPLIED>
 
-<!ELEMENT build       #PCDATA>
-
+<!--
+Reply message from the master when registration of a slave was successful
+-->
 <!ELEMENT ok          EMPTY>
 
+<!--
+Generic error message. Can be received in response to registration or build
+initiation.
+-->
 <!ELEMENT error       #PCDATA>
 <!ATTLIST error
           code        CDATA             #REQUIRED
           xml:lang    CDATA             #IMPLIED>
+
+<!--
+Build initiation request sent by the master to a slave.
+-->
+<!ELEMENT build       #PCDATA>
+<!ATTLIST build
+          recipe      CDATA             #REQUIRED>
+
+<!--
+Build request acknowledgement.
+-->
+<!ELEMENT started     EMPTY>
+
+<!--
+Build status reporting: ANS payload sent by the slave for every build step
+processed.
+-->
+<!ELEMENT step        #PCDATA>
+<!ATTLIST step
+          id          ID                #REQUIRED
+          result      (success|failure) #REQUIRED
+          description CDATA             #IMPLIED>
+
+<!--
+Cancellation of a build by the slave.
+-->
+<!ELEMENT aborted     #PCDATA>