diff --git a/requirements.txt b/requirements.txt
index c6f1e41e23..5ba300c78b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,4 +6,4 @@ MarkupSafe==1.1.1
 protobuf==3.12.2
 pypandoc==1.5
 PyYAML==5.3.1
-dataclasses==0.7
\ No newline at end of file
+dataclasses==0.6; python_version < '3.7'
diff --git a/setup.py b/setup.py
index 262edf4831..ba38e947e5 100644
--- a/setup.py
+++ b/setup.py
@@ -51,9 +51,11 @@
         "protobuf >= 3.12.0",
         "pypandoc >= 1.4",
         "PyYAML >= 5.1.1",
+        "dataclasses < 0.7; python_version < '3.7'"
     ),
     extras_require={':python_version<"3.7"': ("dataclasses >= 0.4",),},
     tests_require=("pyfakefs >= 3.6",),
+    python_requires=">=3.6",
     classifiers=(
         "Development Status :: 4 - Beta",
         "Environment :: Console",
@@ -62,6 +64,7 @@
         "Operating System :: POSIX",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
         "Topic :: Software Development :: Code Generators",
         "Topic :: Software Development :: Libraries :: Python Modules",
     ),