diff --git a/CHANGES.rst b/CHANGES.rst
index ccf3171..e1b5319 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -3,6 +3,11 @@
 Changes
 =======
 
+v1.0.0, 2014-02-05
+------------------
+
+Initial stable release
+
 v0.7.0, 2014-01-20
 ------------------
 
diff --git a/README.rst b/README.rst
index 3b51715..84baa70 100644
--- a/README.rst
+++ b/README.rst
@@ -5,12 +5,18 @@ PyEmbed-Mustache
     :target: http://travis-ci.org/pyembed/pyembed-mustache
 .. image:: https://coveralls.io/repos/pyembed/pyembed-mustache/badge.png
     :target: https://coveralls.io/r/pyembed/pyembed-mustache
-.. image:: https://pypip.in/v/pyembed-mustache/badge.png
-    :target: https://crate.io/packages/pyembed-mustache/
 .. image:: https://pypip.in/d/pyembed-mustache/badge.png
-    :target: https://crate.io/packages/pyembed-mustache/
+    :target: https://pypi.python.org/pypi/pyembed-mustache/
+.. image:: https://pypip.in/v/pyembed-mustache/badge.png
+    :target: https://pypi.python.org/pypi/pyembed-mustache/
+.. image:: https://pypip.in/wheel/pyembed-mustache/badge.png
+    :target: https://pypi.python.org/pypi/pyembed-mustache/
+.. image:: https://pypip.in/egg/pyembed-mustache/badge.png
+    :target: https://pypi.python.org/pypi/pyembed-mustache/
+.. image:: https://pypip.in/license/pyembed-mustache/badge.png
+    :target: https://pypi.python.org/pypi/pyembed-mustache/
 
-PyEmbed plugin for rendering embeddings using Mustache templates.
+`PyEmbed`_ plugin for rendering embeddings using `Mustache`_ templates.
 
 Usage
 -----
@@ -31,6 +37,8 @@ where `path` is the path to a directory containing Mustache templates:
 If you don't supply one of these files, a default embedding will be used
 instead.
 
+For more information, see the `PyEmbed`_ website.
+
 Compatibility
 -------------
 
@@ -77,4 +85,6 @@ PyEmbed-Mustache is distributed under the MIT license.
     OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
     WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+.. _PyEmbed: http://pyembed.github.io
+.. _Mustache: http://mustache.github.io
 .. _GitHub: https://github.com/pyembed/pyembed-mustache
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 5c2415e..31c0f34 100644
--- a/setup.py
+++ b/setup.py
@@ -40,10 +40,10 @@ def run_tests(self):
 
 setup(
     name='pyembed-mustache',
-    version='0.7.0',
+    version='1.0.0',
     author='Matt Thomson',
-    author_email='matt.thomson@cantab.net',
-    url='https://github.com/pyembed/pyembed-mustache',
+    author_email='mattjohnthomson@gmail.com',
+    url='http://pyembed.github.io',
     description='PyEmbed plugin for rendering embeddings using Mustache templates',
     long_description=open('README.rst').read() + '\n\n' +
         open('CHANGES.rst').read(),
@@ -73,7 +73,7 @@ def run_tests(self):
     cmdclass={'test': PyTest},
 
     classifiers=[
-        'Development Status :: 4 - Beta',
+        'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',
         'Natural Language :: English',
         'License :: OSI Approved :: MIT License',