diff --git a/analytical/templatetags/piwik.py b/analytical/templatetags/piwik.py
index ec8b97d..37d9777 100644
--- a/analytical/templatetags/piwik.py
+++ b/analytical/templatetags/piwik.py
@@ -15,7 +15,7 @@ from analytical.utils import (is_internal_ip, disable_html,
                               get_required_setting, get_identity)
 
 import warnings
-warnings.warn('The Piwik module will be deprecated', DeprecationWarning)
+warnings.warn('The Piwik module is deprecated; use the Matomo module.', DeprecationWarning)
 
 # domain name (characters separated by a dot), optional port, optional URI path, no slash
 DOMAINPATH_RE = re.compile(r'^(([^./?#@:]+\.)*[^./?#@:]+)+(:[0-9]+)?(/[^/?#@:]+)*$')
diff --git a/docs/services/piwik.rst b/docs/services/piwik.rst
index 21ea04e..852c19f 100644
--- a/docs/services/piwik.rst
+++ b/docs/services/piwik.rst
@@ -1,5 +1,5 @@
 ==================================
-Piwik (Deprecation Path) -- open source web analytics
+Piwik (deprecated) -- open source web analytics
 ==================================
 
 Piwik_ is an open analytics platform currently used by individuals,
@@ -9,12 +9,13 @@ will always be yours, because you run your own analytics server.
 .. _Piwik: http://www.piwik.org/
 
 
-Deprecation Path
-================
+Deprecated
+==========
 
 Note that Piwik is now known as Matomo.  New projects should use the
-Matomo integration.  The Piwik integration in django-analytical will
-eventually be deprecated.
+Matomo integration.  The Piwik integration in django-analytical is
+deprecated and eventually will be removed.
+
 
 Installation
 ============