diff --git a/pythonturtle/__init__.py b/pythonturtle/__init__.py
index 579d744..a3c697f 100644
--- a/pythonturtle/__init__.py
+++ b/pythonturtle/__init__.py
@@ -9,7 +9,7 @@
 demonstrates how to move the turtle and introduces the student to the
 basics of Python programming.
 """
+name = 'PythonTurtle'
+__version__ = '0.3.0'
 __license__ = 'MIT'
-__product_name__ = 'PythonTurtle'
 __url__ = 'http://pythonturtle.org'
-__version__ = '0.3.0'
diff --git a/pythonturtle/application.py b/pythonturtle/application.py
index e164b75..03b0e60 100644
--- a/pythonturtle/application.py
+++ b/pythonturtle/application.py
@@ -207,7 +207,7 @@ def init_about_dialog_info(self):
         info.SetDescription(description)
         info.SetLicence(license_terms)
         info.SetCopyright(license_copyright)
-        info.SetName(pythonturtle.__product_name__)
+        info.SetName(pythonturtle.name)
         info.SetVersion(pythonturtle.__version__)
         info.SetWebSite(pythonturtle.__url__)
         info.SetDevelopers(developer_list)
diff --git a/setup.py b/setup.py
index 2989fdb..77d99e6 100755
--- a/setup.py
+++ b/setup.py
@@ -15,29 +15,40 @@ def read_file(filename):
 
 
 setup(
-    name=package.__name__,
+    name=package.name,
     version=package.__version__,
-    description=package.__doc__,
-    long_description=read_file('README.md'),
+    license=package.__license__,
+    author='Ram Rachum',
+    author_email='ram@rachum.com',
+    description=package.__doc__.strip().split('\n')[0],
     long_description_content_type='text/markdown',
+    long_description=read_file('README.md'),
+    url=package.__url__,
+    project_urls={
+        'Source': 'https://github.com/cool-RR/PythonTurtle',
+    },
+    keywords=['turtle', 'learning', 'children', 'beginners', 'logo '],
     classifiers=[
         'Development Status :: 5 - Production/Stable',
-        'Intended Audience :: Developers',
+        'Environment :: MacOS X',
+        'Environment :: Win32 (MS Windows)',
+        'Environment :: X11 Applications :: GTK',
+        'Intended Audience :: Education',
         'License :: OSI Approved :: MIT License',
-        'Operating System :: OS Independent',
+        'Operating System :: MacOS',
+        'Operating System :: Microsoft :: Windows',
+        'Operating System :: POSIX :: Linux',
+        'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Topic :: Education',
     ],
-    keywords=['turtle', 'learning', 'children', 'beginners', 'logo '],
-    author='Ram Rachum',
-    author_email='ram@rachum.com',
-    url=package.__url__,
-    license=package.__license__,
+    python_requires='>=3',
     packages=find_packages(exclude=['tests']),
     include_package_data=True,
+    zip_safe=True,
     # install_requires=['wxPython'],
     tests_require=['tox'],
-    zip_safe=True,
     entry_points={
         'console_scripts': [
             'PythonTurtle = pythonturtle.__main__:run',