diff --git a/servicereport b/servicereport
deleted file mode 100755
index 40e6a17..0000000
--- a/servicereport
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env python3
-
-# SPDX-License-Identifier: GPL-2.0-only
-#
-# (C) Copyright IBM Corp. 2018, 2019
-# Author: Sourabh Jain <sourabhjain@linux.ibm.com>
-
-"""Entry point script"""
-
-import sys
-
-from servicereportpkg import main
-
-if __name__ == "__main__":
-    sys.exit(main())
diff --git a/setup.cfg b/setup.cfg
index c4be73b..fb47079 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,10 +3,21 @@
 # (C) Copyright IBM Corp. 2018, 2019
 # Author: Sourabh Jain <sourabhjain@linux.ibm.com>
 
-
 [metadata]
-name: ServiceReport
-description: FFDC validation tool
-long_description: Validation tool to verify First Failure Data Capture (FFDC) configurations
-author: Sourabh Jain
-author_email: sourabhjain@linux.ibm.com
+name = ServiceReport
+version = attr: servicereportpkg.get_version
+author = Sourabh Jain
+author_email = sourabhjain@linux.ibm.com
+description = FFDC validation tool
+long_description = file: README.md
+license = GPL-2.0-only
+classifiers =
+    Development Status :: 4 - Beta
+    Programming Language :: Python
+
+[options]
+packages = find:
+
+[options.entry_points]
+console_scripts =
+    servicereport = servicereportpkg:main
diff --git a/setup.py b/setup.py
index a716c71..6068493 100644
--- a/setup.py
+++ b/setup.py
@@ -1,26 +1,3 @@
-# SPDX-License-Identifier: GPL-2.0-only
-#
-# (C) Copyright IBM Corp. 2018, 2019
-# Author: Sourabh Jain <sourabhjain@linux.ibm.com>
+from setuptools import setup
 
-import os
-import sys
-from setuptools import setup, find_packages
-
-from servicereportpkg import get_version
-
-# Workaround for https://bugs.python.org/issue644744
-if "bdist_rpm" in sys.argv[1:]:
-    os.putenv("COMPRESS", " ")
-
-setup(packages=find_packages(),
-      scripts=['servicereport'],
-      version=get_version(),
-      data_files=[('share/man/man8', ['man/servicereport.8']),
-                  ('share/doc/ServiceReport', ['README.md']),
-                  ('share/licenses/ServiceReport', ['COPYING']),
-                  ('/usr/lib/systemd/system',
-                   ['service/servicereport.service'])],
-      classifiers=[
-          'Development Status :: 4 - Beta',
-          'Programming Language :: Python'])
+setup()