2 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 9e262cc..e54b32a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 etckeeper (0.60) UNRELEASED; urgency=low
 
   * Updated Dutch translation of debconf templates. Closes: #654244
+  * Support -h and --help. Closes: #654188
 
  -- Joey Hess <joeyh@debian.org>  Mon, 02 Jan 2012 11:40:20 -0400
 
diff --git a/etckeeper b/etckeeper
index 89656b7..22e3fed 100755
--- a/etckeeper
+++ b/etckeeper
@@ -56,6 +56,9 @@ fi
 
 if [ -z "$1" ]; then
 	usage
+elif [ "x$1" = "x-h" ] || [ "x$1" = "x--help" ]; then
+	man etceeper || echo "Usage: etckeeper command [-d directory]" >&2
+	exit 0
 fi
 command="$1"
 shift 1