diff --git a/elements/java/README.rst b/elements/java/README.rst
new file mode 100644
index 00000000..266b862c
--- /dev/null
+++ b/elements/java/README.rst
@@ -0,0 +1,6 @@
+====
+java
+====
+
+This element configures JAVA_HOME, PATH and the alternatives
+for java and javac.
diff --git a/elements/nc/README.rst b/elements/nc/README.rst
new file mode 100644
index 00000000..e25d36da
--- /dev/null
+++ b/elements/nc/README.rst
@@ -0,0 +1,5 @@
+==
+nc
+==
+
+This element installs nc/netcat.
diff --git a/elements/nfs-shares/README.rst b/elements/nfs-shares/README.rst
new file mode 100644
index 00000000..4b4946b2
--- /dev/null
+++ b/elements/nfs-shares/README.rst
@@ -0,0 +1,5 @@
+==========
+nfs-shares
+==========
+
+This element installs the daemon for the kernel NFS server.
diff --git a/elements/openjdk/README.rst b/elements/openjdk/README.rst
new file mode 100644
index 00000000..dfbf28f4
--- /dev/null
+++ b/elements/openjdk/README.rst
@@ -0,0 +1,5 @@
+=======
+openjdk
+=======
+
+This element installs the correct version of OpenJDK.
diff --git a/elements/sahara-version/README.rst b/elements/sahara-version/README.rst
new file mode 100644
index 00000000..ec76f903
--- /dev/null
+++ b/elements/sahara-version/README.rst
@@ -0,0 +1,5 @@
+==============
+sahara-version
+==============
+
+This element saves the version of a few components in a file.
diff --git a/elements/storm/README.rst b/elements/storm/README.rst
new file mode 100644
index 00000000..23e87950
--- /dev/null
+++ b/elements/storm/README.rst
@@ -0,0 +1,5 @@
+=====
+storm
+=====
+
+This element downloads and configures Apache Storm.
diff --git a/elements/zookeeper/README.rst b/elements/zookeeper/README.rst
new file mode 100644
index 00000000..06f6cfd4
--- /dev/null
+++ b/elements/zookeeper/README.rst
@@ -0,0 +1,5 @@
+=========
+zookeeper
+=========
+
+This element downloads and configures Zookeeper.
diff --git a/tools/run_bashate.sh b/tools/run_bashate.sh
index e8dab515..e48bc540 100755
--- a/tools/run_bashate.sh
+++ b/tools/run_bashate.sh
@@ -1,3 +1,3 @@
 #!/bin/bash -xe
 
-find ./ -not -wholename \*.tox/\* -and \( -name \*.sh -or -wholename \*.d/\* -and -not -name \*.md -and -not -name \*.rst -and -not -name \*.py \) -print0 | xargs -0 bashate -v
+find ./ -not -wholename \*.tox/\* -and \( -name \*.sh -or -wholename \*.d/\* -and -not -name \*.md -and -not -name \*.rst -and -not -name \*.py \) -print0 | xargs -0 bashate -v -i E006