diff --git a/pyquarantine/run.py b/pyquarantine/run.py
index 4cbce22..e85e7d6 100644
--- a/pyquarantine/run.py
+++ b/pyquarantine/run.py
@@ -128,7 +128,7 @@ def main():
         logging.Formatter("pyquarantine: %(message)s"))
     root_logger.addHandler(sysloghandler)
 
-    logger.info("pyquarantine-milter starting")
+    logger.info("milter starting")
 
     # register milter factory class
     Milter.factory = ModifyMilter
@@ -145,7 +145,7 @@ def main():
         rc = 255
 
     mailer.queue.put(None)
-    logger.info("pyquarantine-milter stopped")
+    logger.info("milter stopped")
 
     sys.exit(rc)
 
diff --git a/setup.py b/setup.py
index b1ccb6a..904744a 100644
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,7 @@ setup(name = "pyquarantine",
     entry_points = {
         "console_scripts": [
             "pyquarantine-milter=pyquarantine.run:main",
-            "pyquarantine=pyquarantine.run:main",
+            "pyquarantine=pyquarantine.cli:main",
         ]
     },
     data_files = [