diff --git a/specification/0-feature_profiles.rst b/specification/0-feature_profiles.rst
index 234e14db..dcf7f642 100644
--- a/specification/0-feature_profiles.rst
+++ b/specification/0-feature_profiles.rst
@@ -1,3 +1,38 @@
 Feature Profiles
 ================
 
+Matrix supports many different kinds of clients: from embedded IoT devices to
+desktop clients. Not all clients can provide the same feature sets as other
+clients e.g. due to lack of physical hardware such as not having a screen.
+Clients can fall into one of several profiles and each profile contains a set
+of features that the client MUST support. This section details a set of
+"feature profiles". Clients are expected to implement a profile in its entirety
+in order for it to be classified as that profile.
+
+Summary
+-------
+
+============================ ===== =========== ======== ========= ===== =====
+  Module / Profile            Web   Embed-Web   Mobile   Desktop   CLI   IoT
+============================ ===== =========== ======== ========= ===== =====
+ `End-to-End Encryption`_     YES                YES       YES     YES
+ `Instant Messaging`_         YES    YES         YES       YES     YES   YES
+ `Presence`_                  YES                YES       YES     YES
+ `Push Notifications`_                           YES
+ `Receipts`_                  YES                YES       YES     YES
+ `Typing Notifications`_      YES                YES       YES     YES
+ `VoIP`_                      YES                YES       YES
+ `Content Repository`_        YES                YES       YES     YES
+============================ ===== =========== ======== ========= ===== =====
+
+*Please see each module for more details on what clients need to implement.*
+
+.. _End-to-End Encryption: `module:e2e`_
+.. _Instant Messaging: `module:im`_
+.. _Presence: `module:presence`_
+.. _Push Notifications: `module:push`_
+.. _Receipts: `module:receipts`_
+.. _Typing Notifications: `module:typing`_
+.. _VoIP: `module:voip`_
+.. _Content Repository: `module:content`_
+
diff --git a/specification/modules/content_repo.rst b/specification/modules/content_repo.rst
index 2c45ced7..c2cf3505 100644
--- a/specification/modules/content_repo.rst
+++ b/specification/modules/content_repo.rst
@@ -1,6 +1,8 @@
 Content repository
 ==================
 
+.. _module:content:
+
 HTTP API
 --------
 
diff --git a/specification/modules/end_to_end_encryption.rst b/specification/modules/end_to_end_encryption.rst
index 02388152..e3a52613 100644
--- a/specification/modules/end_to_end_encryption.rst
+++ b/specification/modules/end_to_end_encryption.rst
@@ -1,6 +1,8 @@
 End-to-End Encryption
 =====================
 
+.. _module:e2e:
+
 .. TODO-doc
   - Why is this needed.
   - Overview of process
diff --git a/specification/modules/instant_messaging.rst b/specification/modules/instant_messaging.rst
index 7f582ca4..43a06aa1 100644
--- a/specification/modules/instant_messaging.rst
+++ b/specification/modules/instant_messaging.rst
@@ -1,6 +1,8 @@
 Instant Messaging
 =================
 
+.. _module:im:
+
 Events
 ------
 
diff --git a/specification/modules/presence.rst b/specification/modules/presence.rst
index ddd2adff..cb71107f 100644
--- a/specification/modules/presence.rst
+++ b/specification/modules/presence.rst
@@ -1,5 +1,7 @@
 Presence
 ========
+
+.. _module:presence:
  
 Each user has the concept of presence information. This encodes the
 "availability" of that user, suitable for display on other user's clients.
diff --git a/specification/modules/push_overview.rst b/specification/modules/push_overview.rst
index 972a8eea..46028283 100644
--- a/specification/modules/push_overview.rst
+++ b/specification/modules/push_overview.rst
@@ -1,6 +1,8 @@
 Push Notifications
 ==================
 
+.. _module:push:
+
 Overview
 --------
 
diff --git a/specification/modules/receipts.rst b/specification/modules/receipts.rst
index e2f83eea..9787682f 100644
--- a/specification/modules/receipts.rst
+++ b/specification/modules/receipts.rst
@@ -1,6 +1,8 @@
 Receipts
 --------
 
+.. _module:receipts:
+
 Receipts are used to publish which events in a room the user or their devices
 have interacted with. For example, which events the user has read. For
 efficiency this is done as "up to" markers, i.e. marking a particular event
diff --git a/specification/modules/typing_notifications.rst b/specification/modules/typing_notifications.rst
index 25b714ab..614f6af7 100644
--- a/specification/modules/typing_notifications.rst
+++ b/specification/modules/typing_notifications.rst
@@ -1,6 +1,8 @@
 Typing Notifications
 --------------------
 
+.. _module:typing:
+
 Client APIs
 ~~~~~~~~~~~
 
diff --git a/specification/modules/voip_events.rst b/specification/modules/voip_events.rst
index a5468237..60d61078 100644
--- a/specification/modules/voip_events.rst
+++ b/specification/modules/voip_events.rst
@@ -1,5 +1,8 @@
 Voice over IP
 -------------
+
+.. _module:voip:
+
 Matrix can also be used to set up VoIP calls. This is part of the core
 specification, although is at a relatively early stage. Voice (and video) over
 Matrix is built on the WebRTC 1.0 standard. Call events are sent to a room, like
diff --git a/templating/build.py b/templating/build.py
index 013248f4..6f465607 100755
--- a/templating/build.py
+++ b/templating/build.py
@@ -122,13 +122,13 @@ def main(input_module, file_stream=None, out_dir=None, verbose=False):
 
     # check the input files and substitute in sections where required
     log("Parsing input template: %s" % file_stream.name)
-    temp = Template(file_stream.read())
+    temp = Template(file_stream.read().decode("utf-8"))
     log("Creating output for: %s" % file_stream.name)
     output = create_from_template(temp, sections)
     with open(
             os.path.join(out_dir, os.path.basename(file_stream.name)), "w"
             ) as f:
-        f.write(output)
+        f.write(output.encode("utf-8"))
     log("Output file for: %s" % file_stream.name)
     check_unaccessed("units", units)