diff --git a/Setup.hs b/Setup.hs
--- a/Setup.hs
+++ b/Setup.hs
@@ -1,82 +1,2 @@
-{-  darcs-monitor - Darcs repository monitor
-    Copyright © 2007, 2008 Antti-Juhani Kaijanaho
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
--}
-import Control.Monad
-import Data.Version
-import Distribution.PackageDescription
 import Distribution.Simple
-import Distribution.Simple.Configure
-import Distribution.Simple.LocalBuildInfo
-import Distribution.Simple.Setup
-import System.Directory
-import System.Exit
-import System.IO.Error
-import System.Time
-
-main = defaultMainWithHooks defaultUserHooks { confHook = conf
-                                             , postClean = pclean
-                                             , postBuild = pbuild
-                                               }
-
-conf gpd cf = do
-  let PackageDescription { package = PackageIdentifier 
-                                     { pkgVersion = ver
-                                     , pkgName = name 
-                                     }
-                         }
-          = case gpd of
-              (Left GenericPackageDescription { packageDescription = pd }, _) 
-                  -> pd
-              (Right pd, _)
-                  -> pd
-  writeFile "Version.hs" $ "-- GENERATED FILE -- DO NOT EDIT\n\
-                           \module Version where\n\
-                           \packageVersion = \"" ++
-                           name ++ " " ++
-                           showVersion ver ++ "\""
-  configure gpd cf
-
-substFiles = ["darcs-monitor.1"]
-
-pclean _ _ _ _ = do flip catch ct $ do
-                      removeDirectory "dist"
-                      removeFile "Version.hs"
-                      mapM_ removeFile substFiles
-    where ct ioe | isDoesNotExistError ioe = return ()
-                 | otherwise               = ioError ioe
-
-data Repl = Repl { replDataDir :: FilePath }
-
-pbuild _ _ pd lbi = do
-  mapM_ (substFile pd lbi) substFiles
-
-substFile pd lbi outf = do
-  let inf = outf ++ ".in"
-  imd <- getModificationTime inf
-  omd <- catch (getModificationTime outf) $ \ioe ->
-         if isDoesNotExistError ioe
-         then return (TOD 0 0)
-         else ioError ioe
-  when (imd > omd) $ do
-    putStrLn ("Generating " ++ outf ++ " ...")
-    is <- readFile inf
-    let f ('@':'D':'A':'T':'A':'D':'I':'R':'@':r) = 
-            (datadir (absoluteInstallDirs pd lbi NoCopyDest)) ++ f r
-        f (c:r) = c : f r
-        f []    = []
-    writeFile outf (f is)
-
+main = defaultMain
diff --git a/darcs-monitor.cabal b/darcs-monitor.cabal
--- a/darcs-monitor.cabal
+++ b/darcs-monitor.cabal
@@ -1,6 +1,6 @@
 Cabal-Version: >= 1.2
 Name: darcs-monitor
-Version: 0.3.5
+Version: 0.3.6
 License: GPL
 License-File: GPL.txt
 Author: Antti-Juhani Kaijanaho
@@ -13,7 +13,7 @@
  emails), or periodically from Cron, or occasionally by hand, whatever
  seems most convenient.
 Category: Distribution
-Build-Type: Custom
+Build-Type: Simple
 Extra-Source-Files: README darcs-monitor.1.in
 Data-Files: default-template
 
diff --git a/darcs-monitor.hs b/darcs-monitor.hs
--- a/darcs-monitor.hs
+++ b/darcs-monitor.hs
@@ -26,18 +26,19 @@
 import qualified Data.Map as Map
 import Data.Set (Set)
 import qualified Data.Set as Set
+import Data.Version
 import System.Console.GetOpt
 import System.Directory
 import System.Environment
 import System.Exit
 import System.IO
-import Text.XML.HaXml hiding (when)
+import Text.XML.HaXml hiding (when,version)
 
 import Config
 import Darcs
 import EmailPatch
 import PatchData
-import Version
+import Paths_darcs_monitor (version)
 
 data Opt = HelpOpt
          | VersionOpt
@@ -94,7 +95,8 @@
                               exitWith ExitSuccess
                     where usage pn = "Usage: " ++ pn ++
                                      " [OPTIONS] email RECIPIENT [REPO ...]"
-                VersionOpt -> do putStrLn packageVersion
+                VersionOpt -> do putStrLn $ "darcs-monitor " ++
+                                            showVersion version
                                  exitWith ExitSuccess
                 _ -> return ()
           let dryRun = findOpt roa False $ \opt ->