diff --git a/README.rst b/README.rst
index d138982..dc66d3e 100644
--- a/README.rst
+++ b/README.rst
@@ -141,6 +141,19 @@ issuing the ``clean`` command (with no argument). Example usage::
#ironic clean
+etherpad
+--------
+
+By default the bot generates etherpad links for all tracks. If you already
+have an etherpad, you can set its URL using the ``etherpad`` command::
+
+ #keystone etherpad https://etherpad.openstack.org/p/awesome-keystone-pad
+
+If you set a URL and would like to revert to the autogenerated name, you can
+pass ``auto`` as the etherpad URL::
+
+ #keystone etherpad auto
+
color
-----
@@ -229,7 +242,7 @@ In one terminal, run the bot::
Join that channel and give commands to the bot::
- ~fetchdb http://paste.openstack.org/raw/755516/
+ ~fetchdb http://paste.openstack.org/raw/755522/
#swift now discussing ring placement
(note, the bot currently only takes commands from Freenode identified users)
diff --git a/html/etherpads.html b/html/etherpads.html
new file mode 100644
index 0000000..847bf3a
--- /dev/null
+++ b/html/etherpads.html
@@ -0,0 +1,47 @@
+
+
+
+
+
+ List of PTG Etherpads
+
+
+
+
+
+
List of PTG Etherpads
+
We use etherpads to track the agenda of topics that should be covered in
+each track.