1 files changed, 8 insertions, 4 deletions
diff --git a/setup.py b/setup.py
index e1566752..db95c1ac 100755
--- a/setup.py
+++ b/setup.py
@@ -187,8 +187,12 @@ class cmd_post_install(_install_data):
 
 cmdclass = versioneer.get_cmdclass()
 cmdclass["branding"] = DoBranding
-cmdclass["build"] = cmd_build
-cmdclass["sdist"] = cmd_sdist
+
+# Uncomment this to have the branding command run automatically
+# on the build and sdist commands.
+#cmdclass["build"] = cmd_build
+#cmdclass["sdist"] = cmd_sdist
+
 cmdclass["install_data"] = cmd_post_install
 
 
@@ -196,7 +200,7 @@ launcher_name = branding.get_shortname()
 if launcher_name:
     leap_launcher = 'leap-%s-client=leap.app:main' % launcher_name
 else:
-    leap_launcher = 'leap=leap.app:main'
+    leap_launcher = 'leap-client=leap.app:main'
 
 setup(
     name=branding.get_name(),
@@ -235,7 +239,7 @@ setup(
     # not being used since setuptools does not like it.
     data_files=[
         ("share/man/man1",
-            ["docs/leap.1"]),
+            ["docs/man/leap.1"]),
         ("share/polkit-1/actions",
             ["pkg/linux/polkit/net.openvpn.gui.leap.policy"])
     ],