diff --git a/README.rst b/README.rst
index d5815432..a15c3a8a 100644
--- a/README.rst
+++ b/README.rst
@@ -640,7 +640,7 @@ path. The path can also be configured via the environment variable
 
 To use a client side certificate for the SSL communication, you can pass the
 path of the cert file with ``--cert``. If the private key is not contained
-in the cert file you may pass the path of the key file with ``--certkey``.
+in the cert file you may pass the path of the key file with ``--cert-key``.
 
 If you use Python 2.x and need to talk to servers that use **SNI (Server Name
 Indication)** you need to install some additional dependencies:
@@ -1269,20 +1269,21 @@ Changelog
 *You can click a version name to see a diff with the previous one.*
 
 * `0.9.0-dev`_
-    * Added ``--cert`` and ``--certkey`` parameters to specify a client side
+    * Added ``--cert`` and ``--cert-key`` parameters to specify a client side
       certificate and private key for SSL
-    * Improved unicode support.
-    * Switched from ``unittest`` to ``pytest``.
-    * Various test suite improvements.
-    * Added `CONTRIBUTING`_.
     * Fixed ``User-Agent`` overwriting when used within a session.
     * Fixed handling of empty passwords in URL credentials.
     * Fixed multiple file uploads with the same form field name.
+    * Fixed ``--output=/dev/null`` on Linux.
+    * Improved unicode support.
+    * Improved terminal color depth detection via ``curses``.
     * To make it easier to deal with Windows paths in request items, ``\``
       now only escapes special characters (the ones that are used as key-value
-      separators).
-    * Fixed ``--output=/dev/null`` on Linux.
-    * Improved terminal color depth detection via ``curses``.
+      separators by HTTPie).
+    * Switched from ``unittest`` to ``pytest``.
+    * Various test suite improvements.
+    * Added `CONTRIBUTING`_.
+    * Miscellaneous bugfixes.
 * `0.8.0`_ (2014-01-25)
     * Added ``field=@file.txt`` and ``field:=@file.json`` for embedding
       the contents of text and JSON files into request data.
diff --git a/httpie/cli.py b/httpie/cli.py
index 9b7a454e..575683ce 100644
--- a/httpie/cli.py
+++ b/httpie/cli.py
@@ -471,13 +471,13 @@ network.add_argument(
     help="""
     You can specify a local cert to use as client side SSL certificate.
     This file may either contain both private key and certificate or you may
-    specify --certkey separately.
+    specify --cert-key separately.
 
     """
 )
 
 network.add_argument(
-    '--certkey',
+    '--cert-key',
     default=None,
     type=readable_file_arg,
     help="""
diff --git a/httpie/client.py b/httpie/client.py
index 6444c17e..1073c63c 100644
--- a/httpie/client.py
+++ b/httpie/client.py
@@ -98,8 +98,8 @@ def get_requests_kwargs(args, base_headers=None):
     cert = None
     if args.cert:
         cert = args.cert
-        if args.certkey:
-            cert = cert, args.certkey
+        if args.cert_key:
+            cert = cert, args.cert_key
 
     kwargs = {
         'stream': True,