diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 70e30e6..689fcfc 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -9,6 +9,10 @@
 * More bit-lengths are now support for ``p`` and ``q`` when loading DSA keys
   from numbers.
 
+* Added `~cryptography.hazmat.primitives.interfaces.MACContext` as a common
+  interface for CMAC and HMAC and deprecated
+  `~cryptography.hazmat.primitives.interfaces.CMACContext`.
+
 0.6.1 - 2014-10-15
 ~~~~~~~~~~~~~~~~~~
 
diff --git a/cryptography/hazmat/backends/openssl/cmac.py b/cryptography/hazmat/backends/openssl/cmac.py
index f1d068e..da7b748 100644
--- a/cryptography/hazmat/backends/openssl/cmac.py
+++ b/cryptography/hazmat/backends/openssl/cmac.py
@@ -21,7 +21,6 @@
 
 
 @utils.register_interface(interfaces.MACContext)
-@utils.register_interface(interfaces.CMACContext)
 class _CMACContext(object):
     def __init__(self, backend, algorithm, ctx=None):
         if not backend.cmac_algorithm_supported(algorithm):
diff --git a/cryptography/hazmat/primitives/cmac.py b/cryptography/hazmat/primitives/cmac.py
index 968fa46..7ae5c11 100644
--- a/cryptography/hazmat/primitives/cmac.py
+++ b/cryptography/hazmat/primitives/cmac.py
@@ -22,7 +22,6 @@
 
 
 @utils.register_interface(interfaces.MACContext)
-@utils.register_interface(interfaces.CMACContext)
 class CMAC(object):
     def __init__(self, algorithm, backend, ctx=None):
         if not isinstance(backend, CMACBackend):
diff --git a/cryptography/hazmat/primitives/interfaces.py b/cryptography/hazmat/primitives/interfaces.py
index c09a961..370fd68 100644
--- a/cryptography/hazmat/primitives/interfaces.py
+++ b/cryptography/hazmat/primitives/interfaces.py
@@ -495,4 +495,5 @@
         signature.
         """
 
+# DeprecatedIn07
 CMACContext = MACContext
diff --git a/docs/hazmat/primitives/interfaces.rst b/docs/hazmat/primitives/interfaces.rst
index 2ee2017..931aa96 100644
--- a/docs/hazmat/primitives/interfaces.rst
+++ b/docs/hazmat/primitives/interfaces.rst
@@ -648,6 +648,8 @@
 
 .. class:: CMACContext
 
+    `CMACContext` has been deprecated in favor of `MACContext`.
+
     .. versionadded:: 0.4
 
     .. method:: update(data)