diff --git a/setup.py b/setup.py
index 6a17fcfbc..9a3af57ee 100755
--- a/setup.py
+++ b/setup.py
@@ -495,64 +495,64 @@ setup(name = 'gramps',
       data_files = data_files,
       scripts = ['scripts/gramps'],
       classifiers = [
-          "Classifier: Development Status :: 5 - Production/Stable",
-          "Classifier: Environment :: Console",
-          "Classifier: Environment :: MacOS X",
-          "Classifier: Environment :: Plugins",
-          "Classifier: Environment :: Web Environment",
-          "Classifier: Environment :: Win32 (MS Windows)",
-          "Classifier: Environment :: X11 Applications :: GTK",
-          "Classifier: Framework :: Django",
-          "Classifier: Intended Audience :: Education",
-          "Classifier: Intended Audience :: End Users/Desktop",
-          "Classifier: Intended Audience :: Other Audience",
-          "Classifier: Intended Audience :: Science/Research",
-          "Classifier: License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
-          "Classifier: Natural Language :: Arabic",
-          "Classifier: Natural Language :: Bulgarian",
-          "Classifier: Natural Language :: Catalan",
-          "Classifier: Natural Language :: Chinese (Simplified)",
-          "Classifier: Natural Language :: Croatian",
-          "Classifier: Natural Language :: Czech",
-          "Classifier: Natural Language :: Danish",
-          "Classifier: Natural Language :: Dutch",
-          "Classifier: Natural Language :: English",
-          "Classifier: Natural Language :: Esperanto",
-          "Classifier: Natural Language :: Finnish",
-          "Classifier: Natural Language :: French",
-          "Classifier: Natural Language :: German",
-          "Classifier: Natural Language :: Greek",
-          "Classifier: Natural Language :: Hebrew",
-          "Classifier: Natural Language :: Hungarian",
-          "Classifier: Natural Language :: Italian",
-          "Classifier: Natural Language :: Japanese",
-          "Classifier: Natural Language :: Macedonian",
-          "Classifier: Natural Language :: Norwegian",
-          "Classifier: Natural Language :: Polish",
-          "Classifier: Natural Language :: Portuguese",
-          "Classifier: Natural Language :: Portuguese (Brazilian)",
-          "Classifier: Natural Language :: Romanian",
-          "Classifier: Natural Language :: Russian",
-          "Classifier: Natural Language :: Serbian",
-          "Classifier: Natural Language :: Slovak",
-          "Classifier: Natural Language :: Slovenian",
-          "Classifier: Natural Language :: Spanish",
-          "Classifier: Natural Language :: Swedish",
-          "Classifier: Natural Language :: Turkish",
-          "Classifier: Natural Language :: Vietnamese",
-          "Classifier: Operating System :: MacOS",
-          "Classifier: Operating System :: Microsoft :: Windows",
-          "Classifier: Operating System :: Other OS",
-          "Classifier: Operating System :: POSIX :: BSD",
-          "Classifier: Operating System :: POSIX :: Linux",
-          "Classifier: Operating System :: POSIX :: SunOS/Solaris",
-          "Classifier: Operating System :: Unix",
-          "Classifier: Programming Language :: Python",
-          "Classifier: Programming Language :: Python :: 3",
-          "Classifier: Topic :: Database",
-          "Classifier: Topic :: Desktop Environment :: Gnome",
-          "Classifier: Topic :: Education",
-          "Classifier: Topic :: Scientific/Engineering :: Visualization",
-          "Classifier: Topic :: Sociology :: Genealogy",
+          "Development Status :: 5 - Production/Stable",
+          "Environment :: Console",
+          "Environment :: MacOS X",
+          "Environment :: Plugins",
+          "Environment :: Web Environment",
+          "Environment :: Win32 (MS Windows)",
+          "Environment :: X11 Applications :: GTK",
+          "Framework :: Django",
+          "Intended Audience :: Education",
+          "Intended Audience :: End Users/Desktop",
+          "Intended Audience :: Other Audience",
+          "Intended Audience :: Science/Research",
+          "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
+          "Natural Language :: Arabic",
+          "Natural Language :: Bulgarian",
+          "Natural Language :: Catalan",
+          "Natural Language :: Chinese (Simplified)",
+          "Natural Language :: Croatian",
+          "Natural Language :: Czech",
+          "Natural Language :: Danish",
+          "Natural Language :: Dutch",
+          "Natural Language :: English",
+          "Natural Language :: Esperanto",
+          "Natural Language :: Finnish",
+          "Natural Language :: French",
+          "Natural Language :: German",
+          "Natural Language :: Greek",
+          "Natural Language :: Hebrew",
+          "Natural Language :: Hungarian",
+          "Natural Language :: Italian",
+          "Natural Language :: Japanese",
+          "Natural Language :: Macedonian",
+          "Natural Language :: Norwegian",
+          "Natural Language :: Polish",
+          "Natural Language :: Portuguese",
+          "Natural Language :: Portuguese (Brazilian)",
+          "Natural Language :: Romanian",
+          "Natural Language :: Russian",
+          "Natural Language :: Serbian",
+          "Natural Language :: Slovak",
+          "Natural Language :: Slovenian",
+          "Natural Language :: Spanish",
+          "Natural Language :: Swedish",
+          "Natural Language :: Turkish",
+          "Natural Language :: Vietnamese",
+          "Operating System :: MacOS",
+          "Operating System :: Microsoft :: Windows",
+          "Operating System :: Other OS",
+          "Operating System :: POSIX :: BSD",
+          "Operating System :: POSIX :: Linux",
+          "Operating System :: POSIX :: SunOS/Solaris",
+          "Operating System :: Unix",
+          "Programming Language :: Python",
+          "Programming Language :: Python :: 3",
+          "Topic :: Database",
+          "Topic :: Desktop Environment :: Gnome",
+          "Topic :: Education",
+          "Topic :: Scientific/Engineering :: Visualization",
+          "Topic :: Sociology :: Genealogy",
           ]
 )