diff --git a/AUTHORS b/AUTHORS
index cec88192a1be11c0271de4ddc74f5bb19844c979..070b885fcb6c85c1dda950302a9449049dd38e93 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -35,3 +35,4 @@ stefan <s.freudenberg@jpberlin.de> -- dup support for Amazon S3 buckets
 maniacmartin <martin@maniacmartin.com> -- rdiff confusing error message fix
 Chris Nolan <chris@cenolan.com> -- maildir subdirectory expansion
 Dan Carley -- mysql bugfix
+Jordi Mallach <jordi@debian.org> -- do not error when no jobs are configured
\ No newline at end of file
diff --git a/ChangeLog b/ChangeLog
index 792841e9321864f04da9d680ffe9b8f5838dc771..c5f7dce47811f0ca45d21f8035cfd17ed753ba9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
 version 0.9.9 -- UNRELEASED
+    backupninja changes
+	 . Do not error out when no job is configured. Thanks to Jordi Mallach
+	   <jordi@debian.org> for the patch (Closes: #597684)
     handler changes
 	rdiff:
 	 . Support reading include/exclude patterns from files using the
diff --git a/src/backupninja.in b/src/backupninja.in
index b397a142069ab5ca9f641f65800c9427a86d871a..789debdd01a09ab802c0362e8cfd2a4924b010e5 100755
--- a/src/backupninja.in
+++ b/src/backupninja.in
@@ -519,7 +519,7 @@ else
    files=`find $configdirectory -follow -mindepth 1 -maxdepth 1 -type f ! -name '.*.swp' | sort -n`
 
    if [ -z "$files" ]; then
-      fatal "No backup actions configured in '$configdirectory', run ninjahelper!"
+      info "No backup actions configured in '$configdirectory', run ninjahelper!"
    fi
 fi