diff --git a/news/improved-setup-py-metadata.rst b/news/improved-setup-py-metadata.rst
new file mode 100644
index 000000000..93f89e94d
--- /dev/null
+++ b/news/improved-setup-py-metadata.rst
@@ -0,0 +1,23 @@
+**Added:**
+
+* Multiple new metadata fields in ``setup.py``
+
+**Changed:**
+
+* <news item>
+
+**Deprecated:**
+
+* <news item>
+
+**Removed:**
+
+* <news item>
+
+**Fixed:**
+
+* <news item>
+
+**Security:**
+
+* <news item>
diff --git a/setup.py b/setup.py
index df9d6cb75..f0d97d0cb 100755
--- a/setup.py
+++ b/setup.py
@@ -290,9 +290,31 @@ def main():
         author="Anthony Scopatz",
         maintainer="Anthony Scopatz",
         author_email="scopatz@gmail.com",
-        url="https://github.com/xonsh/xonsh",
+        url="https://xon.sh",
         platforms="Cross Platform",
-        classifiers=["Programming Language :: Python :: 3"],
+        project_urls={
+            "Changelog": "https://github.com/xonsh/xonsh/blob/main/CHANGELOG.rst",
+            "Repository": "https://github.com/xonsh/xonsh",
+            "Documentation": "https://xon.sh/contents.html",
+            "Issue tracker": "https://github.com/xonsh/xonsh/issues",
+        },
+        classifiers=[
+            "Development Status :: 4 - Beta",
+            "Environment :: Console",
+            "Intended Audience :: Developers",
+            "License :: OSI Approved :: BSD License",
+            "Natural Language :: English",
+            "Operating System :: OS Independent",
+            "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",
+            "Programming Language :: Python :: 3",
+            "Topic :: System :: Shells",
+            "Topic :: System :: System Shells",
+        ],
+        keywords="python shell cli command-line prompt xonsh",
         packages=[
             "xonsh",
             "xonsh.ply.ply",