diff --git a/nvchecker/__init__.py b/nvchecker/__init__.py
index cff076e..5a80f80 100644
--- a/nvchecker/__init__.py
+++ b/nvchecker/__init__.py
@@ -1,4 +1,4 @@
 # MIT licensed
 # Copyright (c) 2013-2021 lilydjwg <lilydjwg@gmail.com>, et al.
 
-__version__ = '2.4'
+__version__ = '2.5dev'
diff --git a/setup.py b/setup.py
index 0184c86..3a0c9e1 100755
--- a/setup.py
+++ b/setup.py
@@ -21,9 +21,11 @@ setup(
   zip_safe = True,
 
   packages = find_namespace_packages(exclude=['tests', 'build*', 'docs*']),
-  install_requires = ['setuptools', 'packaging', 'toml', 'structlog', 'appdirs', 'tornado>=6', 'pycurl'],
+  install_requires = ['setuptools; python_version<"3.8"', 'toml', 'structlog', 'appdirs', 'tornado>=6', 'pycurl'],
   extras_require = {
     'vercmp': ['pyalpm'],
+    'pypi': ['packaging'],
+    'htmlparser': ['lxml'],
   },
   tests_require = [
     'pytest',
@@ -55,6 +57,7 @@ setup(
     "Programming Language :: Python :: 3 :: Only",
     "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
     "Topic :: Internet",
     "Topic :: Internet :: WWW/HTTP",
     "Topic :: Software Development",