diff --git a/setup.py b/setup.py
index ff87842..1886039 100644
--- a/setup.py
+++ b/setup.py
@@ -12,29 +12,35 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-from setuptools import setup, find_packages
+from setuptools import setup
 
+_name = "osmclient"
+_version_command = ("git describe --match v* --tags --long --dirty", "pep440-git-full")
 _description = "OSM client library and console script"
+_author = "OSM Support"
+_author_email = "osmsupport@etsi.org"
+_maintainer = "OSM Support"
+_maintainer_email = "osmsupport@etsi.org"
+_license = "Apache 2.0"
+_url = "https://osm.etsi.org/gitweb/?p=osm/osmclient.git;a=tree"
 
 setup(
-    name="osmclient",
-    version_command=(
-        "git describe --match v* --tags --long --dirty",
-        "pep440-git-full",
-    ),
-    author="ETSI",
-    packages=find_packages(),
-    include_package_data=True,
-    maintainer="Gerardo Garcia",
-    maintainer_email="gerardo.garciadeblas@telefonica.com",
+    name=_name,
+    version_command=_version_command,
     description=_description,
-    license='Apache 2',
-
-    setup_requires=['setuptools-version-command'],
-    test_suite='nose.collector',
+    author=_author,
+    author_email=_author_email,
+    maintainer=_maintainer,
+    maintainer_email=_maintainer_email,
+    url=_url,
+    license=_license,
+    packages=[_name],
+    package_dir={_name: _name},
+    include_package_data=True,
     entry_points={
         "console_scripts": [
             "osm = osmclient.scripts.osm:cli",
         ],
     },
+    setup_requires=['setuptools-version-command'],
 )