diff --git a/README.md b/README.md
index 08d6e80..d3670b9 100644
--- a/README.md
+++ b/README.md
@@ -44,8 +44,7 @@ Only projects that are stable and useful to users are added. Projects that do no
 
 ### Command-line argument parsing
 
-* [docopt/docopt.rs](https://github.com/docopt/docopt.rs) — a Rust implementation of [DocOpt](http://docopt.org)
-* [wycats/hammer.rs](https://github.com/wycats/hammer.rs)
+* [docopt/docopt.rs](https://github.com/docopt/docopt.rs) — a Rust implementation of [DocOpt](http://docopt.org) [<img src="https://travis-ci.org/docopt/docopt.rs.svg?branch=master">](https://travis-ci.org/docopt/docopt.rs)
 
 ### Compression
 
@@ -131,7 +130,6 @@ Only projects that are stable and useful to users are added. Projects that do no
 ### Template engine
 
 * Mustache
-  * [erickt/rust-mustache](https://github.com/erickt/rust-mustache) — [<img src="https://travis-ci.org/erickt/rust-mustache.svg?branch=master">](https://travis-ci.org/erickt/rust-mustache)
   * [rustache/rustache](https://github.com/rustache/rustache) — [<img src="https://travis-ci.org/rustache/rustache.svg?branch=master">](https://travis-ci.org/rustache/rustache)
 
 ### Testing
diff --git a/UNSTABLE.md b/UNSTABLE.md
index 7133744..e4b8a9a 100644
--- a/UNSTABLE.md
+++ b/UNSTABLE.md
@@ -35,6 +35,7 @@ A list of awesome but unstable/experimental Rust projects which some day hopeful
 
 ### Command-line argument parsing
 
+* [wycats/hammer.rs](https://github.com/wycats/hammer.rs)
 
 ### Compression
 
@@ -116,6 +117,7 @@ A list of awesome but unstable/experimental Rust projects which some day hopeful
 ### Template engine
 
 * Mustache
+  * [erickt/rust-mustache](https://github.com/erickt/rust-mustache) — [<img src="https://travis-ci.org/erickt/rust-mustache.svg?branch=master">](https://travis-ci.org/erickt/rust-mustache)
 
 ### Testing
 
diff --git a/generate_markdown_files.py b/generate_markdown_files.py
index 09f60f7..4dbd629 100644
--- a/generate_markdown_files.py
+++ b/generate_markdown_files.py
@@ -58,10 +58,13 @@ DATA = \
         },
       "docopt/docopt.rs": {
           "url": "https://github.com/docopt/docopt.rs",
-          "descr": "a Rust implementation of " + md_link('DocOpt', 'http://docopt.org')
+          "descr": "a Rust implementation of " + md_link('DocOpt', 'http://docopt.org'),
+          "travis_url": "https://travis-ci.org/docopt/docopt.rs",
+          "travis_badge": "https://travis-ci.org/docopt/docopt.rs.svg?branch=master"
         },
       "wycats/hammer.rs": {
-          "url": "https://github.com/wycats/hammer.rs"
+          "url": "https://github.com/wycats/hammer.rs",
+          "unstable": True
         },
       "lifthrasiir/rust-zip": {
           "url": "https://github.com/lifthrasiir/rust-zip",
@@ -215,16 +218,17 @@ DATA = \
           "travis_badge": "https://travis-ci.org/erickt/rust-zmq.svg?branch=master"
         },
       "zeromq/zmq.rs": {
-            "url": "https://github.com/zeromq/zmq.rs",
-            "descr": "Rust implementation of the " + md_link('ZeroMQ', 'http://zeromq.org') + "protocol",
-            "travis_url": "https://travis-ci.org/zeromq/zmq.rs",
-            "travis_badge": "https://travis-ci.org/zeromq/zmq.rs.svg?branch=master",
-            "unstable": True
+          "url": "https://github.com/zeromq/zmq.rs",
+          "descr": "Rust implementation of the " + md_link('ZeroMQ', 'http://zeromq.org') + "protocol",
+          "travis_url": "https://travis-ci.org/zeromq/zmq.rs",
+          "travis_badge": "https://travis-ci.org/zeromq/zmq.rs.svg?branch=master",
+          "unstable": True
         },
       "erickt/rust-mustache": {
           "url": "https://github.com/erickt/rust-mustache",
           "travis_url": "https://travis-ci.org/erickt/rust-mustache",
-          "travis_badge": "https://travis-ci.org/erickt/rust-mustache.svg?branch=master"
+          "travis_badge": "https://travis-ci.org/erickt/rust-mustache.svg?branch=master",
+          "unstable": True
         },
       "BurntSushi/quickcheck": {
           "url": "https://github.com/BurntSushi/quickcheck",