diff --git a/Jukebox/Options.hs b/Jukebox/Options.hs
--- a/Jukebox/Options.hs
+++ b/Jukebox/Options.hs
@@ -275,7 +275,10 @@
 -- Use the program name as a tool name if possible.
 getEffectiveArgs :: ToolParser a -> IO [String]
 getEffectiveArgs (Annotated tools _) = do
-  progName <- getProgName
+  progName <-
+    case tools of
+      [tool] -> return (toolProgName tool)
+      _ -> getProgName
   args <- getArgs
   if progName `elem` map toolProgName tools
     then return (progName:args)
@@ -283,7 +286,10 @@
 
 parseCommandLine :: Tool -> ToolParser a -> IO a
 parseCommandLine t p = do
-  let p' = versionTool t `mappend` helpTool t p `mappend` p
+  let p' =
+        case p of
+          Annotated [_] _ -> p
+          _ -> versionTool t `mappend` helpTool t p `mappend` p
   args <- getEffectiveArgs p'
   case runPref (parser p') args of
     Left (Mistake err) -> printHelp (ExitFailure 1) (argError t err)
@@ -337,7 +343,7 @@
   ]
 
 greeting :: Tool -> String
-greeting t = toolName t ++ ", version " ++ toolVersion t ++ ", 2011-10-04."
+greeting t = toolName t ++ ", version " ++ toolVersion t ++ "."
 
 usage :: Tool -> String -> [String]
 usage t opts = [
diff --git a/jukebox.cabal b/jukebox.cabal
--- a/jukebox.cabal
+++ b/jukebox.cabal
@@ -1,5 +1,5 @@
 Name: jukebox
-Version: 0.1.5
+Version: 0.1.6
 Cabal-version: >= 1.8
 Build-type: Simple
 Author: Nick Smallbone