diff --git a/Tests.hs b/Tests.hs
--- a/Tests.hs
+++ b/Tests.hs
@@ -164,7 +164,7 @@
 
 Nafai's bug
 @
-$ printf "2009/1/1 x\n a:  13\n b\n" | hledger -f - bal -E 2>&1
+$ printf "2009/1/1 x\n a:  13\n b\n" | hledger -f - bal -E 2>&1; true
 "-" (line 2, column 1):
 unexpected " "
 accountname seems ill-formed: a:
@@ -202,7 +202,7 @@
 import Locale (defaultTimeLocale)
 import Text.ParserCombinators.Parsec
 import Test.HUnit.Tools (runVerboseTests)
-import System.Exit (exitFailure,exitSuccess)
+import System.Exit (exitFailure, exitWith, ExitCode(ExitSuccess)) -- base 3 compatible
 
 import Commands.All
 import Ledger
@@ -214,7 +214,7 @@
   (counts,_) <- runner ts
   if errors counts > 0 || (failures counts > 0)
    then exitFailure
-   else exitSuccess
+   else exitWith ExitSuccess
     where
       runner | (Verbose `elem` opts) = runVerboseTests
              | otherwise = \t -> runTestTT t >>= return . (flip (,) 0)
diff --git a/Version.hs b/Version.hs
--- a/Version.hs
+++ b/Version.hs
@@ -15,7 +15,7 @@
 import Options (progname)
 
 -- version and PATCHLEVEL are set by the makefile
-version       = "0.6.0"
+version       = "0.6.1"
 
 #ifdef PATCHLEVEL
 patchlevel = "." ++ show PATCHLEVEL -- must be numeric !
@@ -28,7 +28,7 @@
 binaryfilename = prettify $ splitAtElement '.' buildversion :: String
                 where
                   prettify (major:minor:bugfix:patches:[]) =
-                      printf "hledger-%s.%s%s%s-%s-%s" major minor bugfix' patches' os' arch
+                      printf "hledger-%s.%s%s%s-%s-%s%s" major minor bugfix' patches' os' arch suffix
                           where
                             bugfix'
                                 | bugfix `elem` ["0"{-,"98","99"-}] = ""
@@ -36,9 +36,10 @@
                             patches'
                                 | patches/="0" = "+"++patches
                                 | otherwise = ""
-                            os'
-                                | os == "darwin" = "mac"
-                                | otherwise = os
+                            (os',suffix)
+                                | os == "darwin"  = ("mac","")
+                                | os == "mingw32" = ("windows",".exe")
+                                | otherwise       = (os,"")
                   prettify (major:minor:bugfix:[]) = prettify (major:minor:bugfix:"0":[])
                   prettify (major:minor:[])        = prettify (major:minor:"0":"0":[])
                   prettify (major:[])              = prettify (major:"0":"0":"0":[])
diff --git a/hledger.cabal b/hledger.cabal
--- a/hledger.cabal
+++ b/hledger.cabal
@@ -1,6 +1,6 @@
 name:           hledger
 -- Version is set by the makefile
-version:        0.6
+version:        0.6.1
 category:       Finance
 synopsis:       A command-line (or curses or web-based) double-entry accounting tool.
 description: