diff --git a/README.rst b/README.rst
index 5199a208d6a10b28e7bb8ffd1792be85a31c44c3..65abebdda0e503849f34ab14194208a0ef018caa 100644
--- a/README.rst
+++ b/README.rst
@@ -17,6 +17,14 @@ Template
     :target: https://pypistats.org/packages/template
     :alt: PyPI Stats
 
+|
+
+.. image:: https://img.shields.io/pypi/implementation/template.svg
+    :alt: Supported Python implementations
+
+.. image:: https://img.shields.io/pypi/pyversions/template.svg
+    :alt: Supported Python versions
+
 A CLI tool for generating files from `Jinja2 <http://jinja.pocoo.org/>`_
 templates and environment variables.
 
diff --git a/setup.py b/setup.py
index 0a5a8c9bacaddfb3e5ca660a66bf13c707f58f34..87b383e9aefb6aedee9b78575ade9103916bf1aa 100644
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,11 @@ setup(
     license="AGPLv3+",
     classifiers=[
         "Development Status :: 4 - Beta",
+        "Environment :: Console",
         "Intended Audience :: Developers",
+        "Intended Audience :: Information Technology",
+        "Intended Audience :: System Administrators",
+        "License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)",  # noqa: E501 pylint: disable=line-too-long
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
@@ -23,9 +27,10 @@ setup(
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 2",
         "Programming Language :: Python :: 2.7",
-        "Intended Audience :: System Administrators",
+        "Programming Language :: Python :: Implementation :: CPython",
+        "Programming Language :: Python :: Implementation :: PyPy",
+        "Topic :: Text Processing",
         "Topic :: Utilities",
-        "License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)",  # noqa: E501 pylint: disable=line-too-long
     ],
     keywords="config configuration jinja template environment",
     packages=find_packages(),