diff --git a/group-by-date.cabal b/group-by-date.cabal
--- a/group-by-date.cabal
+++ b/group-by-date.cabal
@@ -1,10 +1,11 @@
+Cabal-Version:  2.2
 Name:           group-by-date
-Version:        0.1.0.3
-License:        BSD3
+Version:        0.1.0.4
+License:        BSD-3-Clause
 License-File:   LICENSE
 Author:         Henning Thielemann <haskell@henning-thielemann.de>
 Maintainer:     Henning Thielemann <haskell@henning-thielemann.de>
-Homepage:       http://hub.darcs.net/thielema/group-by-date/
+Homepage:       https://hub.darcs.net/thielema/group-by-date/
 Category:       Console
 Synopsis:       Shell command for grouping files by dates into folders
 Description:
@@ -45,21 +46,20 @@
   Media for photographies is often formatted with FAT.
   This may yield trouble with respect to timezones.
 Tested-With:    GHC==7.8.4, GHC==8.2.1
-Cabal-Version:  >=1.6
 Build-Type:     Simple
 
 Source-Repository this
-  Tag:         0.1.0.3
+  Tag:         0.1.0.4
   Type:        darcs
-  Location:    http://hub.darcs.net/thielema/group-by-date/
+  Location:    https://hub.darcs.net/thielema/group-by-date/
 
 Source-Repository head
   Type:        darcs
-  Location:    http://hub.darcs.net/thielema/group-by-date/
+  Location:    https://hub.darcs.net/thielema/group-by-date/
 
 Executable group-by-date
   Build-Depends:
-    hsshellscript >=3.1.0 && <3.5,
+    shell-utility >=0.0 && <0.2,
     filemanip >=0.3.5 && <0.4,
     pathtype >=0.8 && <0.9,
     time >=1.5 && <1.10,
@@ -69,6 +69,7 @@
     utility-ht >=0.0.1 && <0.1,
     base >=3 && <5
 
+  Default-Language: Haskell98
   GHC-Options:    -Wall
   Hs-source-dirs: src
   Other-Modules:  GroupByDate
diff --git a/src/GroupByDate.hs b/src/GroupByDate.hs
--- a/src/GroupByDate.hs
+++ b/src/GroupByDate.hs
@@ -5,11 +5,11 @@
 import qualified System.Path.PartClass as PartClass
 import qualified System.Path as Path
 import System.Path ((</>), )
-import HsShellScript.Shell (shell_quote, )
 
 import qualified Data.Time.Format as Time
 import Data.Time.Clock.POSIX (posixSecondsToUTCTime, )
 
+import Shell.Utility.Quote as Quote
 import Text.Printf (printf, )
 
 import Control.Monad.HT ((<=<), )
@@ -48,12 +48,12 @@
 commandFromPath fullDst cmd fmt src = do
    dst <- folderFromPath fmt src
    printf "mkdir -p %s && %s %s %s\n"
-      (shell_quote $/ dst)
+      (Quote.minimal $/ dst)
       cmd
-      (shell_quote $/ src)
+      (Quote.minimal $/ src)
       (if fullDst
-         then shell_quote $/ makeDstPath src dst
-         else shell_quote $/ dst)
+         then Quote.minimal $/ makeDstPath src dst
+         else Quote.minimal $/ dst)
 
 movePath :: (PartClass.AbsRel ar) => String -> Path.File ar -> IO ()
 movePath fmt src = do