diff --git a/README b/README
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-`hdaemonize-0.4.3`
+`hdaemonize-0.5.0`
 =================
 
 `hdaemonize` is a simple library that hides some of the complexities
@@ -66,6 +66,10 @@
 
 Changelog
 ---------
+
+* 0.5
+    * added support for hsyslog 2.0
+    * add configurable time between SIGTERM and SIGKILL when shutting down
 
 * 0.4
     * added support for a privileged action before dropping privileges
diff --git a/System/Posix/Daemonize.hs b/System/Posix/Daemonize.hs
--- a/System/Posix/Daemonize.hs
+++ b/System/Posix/Daemonize.hs
@@ -45,6 +45,7 @@
    http://sneakymustard.com/2008/12/11/haskell-daemons -}
 
 
+import Control.Monad (when)
 import Control.Monad.Trans
 import Control.Exception.Extensible
 import qualified Control.Monad as M (forever)
@@ -146,8 +147,11 @@
   args <- getArgs
   process daemon' args
     where
-      
+#if MIN_VERSION_hsyslog(2,0,0)
+      program' daemon = withSyslog (fromJust $ name daemon) (syslogOptions daemon) DAEMON [] $
+#else
       program' daemon = withSyslog (fromJust $ name daemon) (syslogOptions daemon) DAEMON $
+#endif
                       do let log = syslog Notice
                          log "starting"
                          pidWrite daemon
@@ -162,15 +166,13 @@
                  
       process daemon ["stop"]  = 
           do pid <- pidRead daemon
-             let ifdo x f = x >>= \x -> if x then f else pass
              case pid of
                Nothing  -> pass
                Just pid -> 
-                   (do signalProcess sigTERM pid
-                       usleep (10^6)
-                       ifdo (pidLive pid) $ 
-                            do usleep (3*10^6)
-                               ifdo (pidLive pid) (signalProcess sigKILL pid))
+                   (do whenM (pidLive pid) $
+                            do signalProcess sigTERM pid
+                               usleep (10^3)
+                               wait (killWait daemon) pid)
                    `finally`
                    removeLink (pidFile daemon)
 
@@ -179,6 +181,20 @@
       process _      _ = 
         getProgName >>= \pname -> putStrLn $ "usage: " ++ pname ++ " {start|stop|restart}"
 
+      -- Wait 'secs' seconds for the process to exit, checking
+      -- for liveness once a second.  If still alive send sigKILL.
+      wait :: Maybe Int -> CPid -> IO ()
+      wait secs pid =
+          whenM (pidLive pid) $
+               if maybe True (> 0) secs
+               then do usleep (10^6)
+                       wait (fmap (\x->x-1) secs) pid
+               else signalProcess sigKILL pid
+
+-- | A monadic-conditional version of the "when" guard (copied from shelly.)
+whenM :: Monad m => m Bool -> m () -> m ()
+whenM c a = c >>= \res -> when res a
+
 -- | The details of any given daemon are fixed by the 'CreateDaemon'
 -- record passed to 'serviced'.  You can also take a predefined form
 -- of 'CreateDaemon', such as 'simpleDaemon' below, and set what
@@ -213,13 +229,16 @@
                          -- the user field.
   syslogOptions :: [Option], -- ^ The options the daemon should set on
                              -- syslog.  You can safely leave this as @[]@.
-  pidfileDirectory :: Maybe FilePath -- ^ The directory where the
-                                     -- daemon should write and look
-                                     -- for the PID file.  'Nothing'
-                                     -- means @/var/run@.  Unless you
-                                     -- have a good reason to do
-                                     -- otherwise, leave this as
-                                     -- 'Nothing'.
+  pidfileDirectory :: Maybe FilePath, -- ^ The directory where the
+                                      -- daemon should write and look
+                                      -- for the PID file.  'Nothing'
+                                      -- means @/var/run@.  Unless you
+                                      -- have a good reason to do
+                                      -- otherwise, leave this as
+                                      -- 'Nothing'.
+  killWait :: Maybe Int -- ^ How many seconds to wait between sending
+                        -- sigTERM and sending sigKILL.  If Nothing
+                        -- wait forever.  Default 4.
 }
 
 -- | The simplest possible instance of 'CreateDaemon' is 
@@ -246,7 +265,8 @@
   syslogOptions = [],
   pidfileDirectory = Nothing,
   program = const $ M.forever $ return (),
-  privilegedAction = return ()
+  privilegedAction = return (),
+  killWait = Just 4
 }
   
 
diff --git a/hdaemonize.cabal b/hdaemonize.cabal
--- a/hdaemonize.cabal
+++ b/hdaemonize.cabal
@@ -1,5 +1,5 @@
 Name:		hdaemonize
-Version:	0.4.5.0
+Version:	0.5.0.0
 Cabal-Version:  >= 1.6
 License:	BSD3
 License-file:   LICENSE