diff --git a/rust2rpm/util.py b/rust2rpm/util.py
index 80d7c91..fe6916b 100644
--- a/rust2rpm/util.py
+++ b/rust2rpm/util.py
@@ -56,13 +56,13 @@ def detect_packager():
     # If we're detecting packager identity through rpmdev-packager...
     rpmdev_packager = shutil.which('rpmdev-packager')
     if rpmdev_packager is not None:
-        return subprocess.check_output(rpmdev_packager, universal_newlines=True).strip()
+        return subprocess.check_output(rpmdev_packager, text=True).strip()
 
     # If we're detecting packager identity through git configuration...
     git = shutil.which('git')
     if git is not None:
-        name = subprocess.check_output([git, 'config', 'user.name'], universal_newlines=True).strip()
-        email = subprocess.check_output([git, 'config', 'user.email'], universal_newlines=True).strip()
+        name = subprocess.check_output([git, 'config', 'user.name'], text=True).strip()
+        email = subprocess.check_output([git, 'config', 'user.email'], text=True).strip()
         return f'{name} <{email}>'
 
     return None
diff --git a/setup.py b/setup.py
index 57da17f..64aecb8 100644
--- a/setup.py
+++ b/setup.py
@@ -49,7 +49,6 @@ ARGS = dict(
         "License :: OSI Approved :: MIT License",
         "Operating System :: POSIX :: Linux",
         "Programming Language :: Python :: 3 :: Only",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",