diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2007-2012 Dino Morelli
+Copyright (c) 2007-2015 Dino Morelli
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/photoname.cabal b/photoname.cabal
--- a/photoname.cabal
+++ b/photoname.cabal
@@ -1,15 +1,15 @@
 name:                photoname
 cabal-version:       >= 1.8
-version:             3.0.1
+version:             3.1
 build-type:          Simple
 license:             BSD3
 license-file:        LICENSE
-copyright:           2007-2012 Dino Morelli 
+copyright:           2007-2015 Dino Morelli
 author:              Dino Morelli 
 maintainer:          Dino Morelli <dino@ui3.info>
 stability:           stable
-homepage:            http://ui3.info/d/proj/photoname.html
-synopsis:            Rename JPEG photo files based on shoot date
+homepage:            http://hub.darcs.net/dino/photoname
+synopsis:            Rename photo image files based on EXIF shoot date
 description:         
    Command-line utility for renaming/moving photo image files based on 
    EXIF tags.
@@ -17,6 +17,10 @@
 tested-with:         GHC >= 7.6.1
 
 extra-source-files:  testsuite/resources/*.jpg
+
+source-repository    head
+   type:             darcs
+   location:         http://hub.darcs.net/dino/photoname
 
 executable           photoname
    main-is:          photoname.hs
diff --git a/src/Photoname/Common.hs b/src/Photoname/Common.hs
--- a/src/Photoname/Common.hs
+++ b/src/Photoname/Common.hs
@@ -1,4 +1,3 @@
--- Copyright: 2007-2012 Dino Morelli
 -- License: BSD3 (see LICENSE)
 -- Author: Dino Morelli <dino@ui3.info>
 
@@ -13,14 +12,14 @@
    )
    where
 
-import Control.Monad.Error
+import Control.Monad.Except
 import Control.Monad.Reader
 
 import Photoname.Opts ( Options (..) )
 
 
-type Ph a = ReaderT Options (ErrorT String IO) a
+type Ph a = ReaderT Options (ExceptT String IO) a
 
 
 runRename :: Options -> Ph a -> IO (Either String a)
-runRename env action = runErrorT $ runReaderT action env
+runRename env action = runExceptT $ runReaderT action env
diff --git a/src/Photoname/Date.hs b/src/Photoname/Date.hs
--- a/src/Photoname/Date.hs
+++ b/src/Photoname/Date.hs
@@ -1,4 +1,3 @@
--- Copyright: 2007-2012 Dino Morelli
 -- License: BSD3 (see LICENSE)
 -- Author: Dino Morelli <dino@ui3.info>
 
@@ -13,7 +12,6 @@
 import Data.Time.Calendar
 import Data.Time.Format
 import Data.Time.LocalTime
-import System.Locale ( defaultTimeLocale )
 import Text.ParserCombinators.Parsec
 
 
diff --git a/src/Photoname/DateFormat.hs b/src/Photoname/DateFormat.hs
--- a/src/Photoname/DateFormat.hs
+++ b/src/Photoname/DateFormat.hs
@@ -1,4 +1,3 @@
--- Copyright: 2007-2012 Dino Morelli
 -- License: BSD3 (see LICENSE)
 -- Author: Dino Morelli <dino@ui3.info>
 
diff --git a/src/Photoname/Exif.hs b/src/Photoname/Exif.hs
--- a/src/Photoname/Exif.hs
+++ b/src/Photoname/Exif.hs
@@ -1,4 +1,3 @@
--- Copyright: 2007-2012 Dino Morelli
 -- License: BSD3 (see LICENSE)
 -- Author: Dino Morelli <dino@ui3.info>
 
@@ -8,7 +7,7 @@
    where
 
 import Control.Exception
-import Control.Monad.Error
+import Control.Monad.Except
 import Graphics.Exif ( fromFile, getTag, Exif )
 import System.IO.Error
 
diff --git a/src/Photoname/Opts.hs b/src/Photoname/Opts.hs
--- a/src/Photoname/Opts.hs
+++ b/src/Photoname/Opts.hs
@@ -1,7 +1,10 @@
--- Copyright: 2007-2012 Dino Morelli
 -- License: BSD3 (see LICENSE)
 -- Author: Dino Morelli <dino@ui3.info>
 
+-- This is for GHC 7.8/7.10 compatibility with the
+-- Control.Applicative import below
+{-# OPTIONS_GHC -fno-warn-unused-imports #-}
+
 module Photoname.Opts
    ( Options (..)
    , parseOpts, usageText
@@ -9,6 +12,8 @@
    where
 
 import Control.Applicative
+import Data.Version ( showVersion )
+import Paths_photoname ( version )
 import System.Console.GetOpt
 import System.Directory
 
@@ -183,5 +188,5 @@
          , "photoname invoked with --suffix=_dwm :"
          , "   20020502-132307_dwm.jpg"
          , ""
-         , "Version 3.0.1  Dino Morelli <dino@ui3.info>"
+         , "Version " ++ (showVersion version) ++ "  Dino Morelli <dino@ui3.info>"
          ]
diff --git a/src/Photoname/SerialFormat.hs b/src/Photoname/SerialFormat.hs
--- a/src/Photoname/SerialFormat.hs
+++ b/src/Photoname/SerialFormat.hs
@@ -1,4 +1,3 @@
--- Copyright: 2007-2012 Dino Morelli
 -- License: BSD3 (see LICENSE)
 -- Author: Dino Morelli <dino@ui3.info>
 
diff --git a/src/photoname.hs b/src/photoname.hs
--- a/src/photoname.hs
+++ b/src/photoname.hs
@@ -1,4 +1,3 @@
--- Copyright: 2007-2012 Dino Morelli
 -- License: BSD3 (see LICENSE)
 -- Author: Dino Morelli <dino@ui3.info>
 
diff --git a/testsuite/TestHelp.hs b/testsuite/TestHelp.hs
--- a/testsuite/TestHelp.hs
+++ b/testsuite/TestHelp.hs
@@ -1,4 +1,3 @@
--- Copyright: 2007-2012 Dino Morelli
 -- License: BSD3 (see LICENSE)
 -- Author: Dino Morelli <dino@ui3.info>
 
diff --git a/testsuite/TestLink.hs b/testsuite/TestLink.hs
--- a/testsuite/TestLink.hs
+++ b/testsuite/TestLink.hs
@@ -1,4 +1,3 @@
--- Copyright: 2007-2012 Dino Morelli
 -- License: BSD3 (see LICENSE)
 -- Author: Dino Morelli <dino@ui3.info>
 
diff --git a/testsuite/Util.hs b/testsuite/Util.hs
--- a/testsuite/Util.hs
+++ b/testsuite/Util.hs
@@ -1,4 +1,3 @@
--- Copyright: 2007-2012 Dino Morelli
 -- License: BSD3 (see LICENSE)
 -- Author: Dino Morelli <dino@ui3.info>
 
diff --git a/testsuite/runtests.hs b/testsuite/runtests.hs
--- a/testsuite/runtests.hs
+++ b/testsuite/runtests.hs
@@ -1,4 +1,3 @@
--- Copyright: 2007-2012 Dino Morelli
 -- License: BSD3 (see LICENSE)
 -- Author: Dino Morelli <dino@ui3.info>