diff --git a/src/lxc/tools/lxc_config.c b/src/lxc/tools/lxc_config.c
index c204447ae..86187bd57 100644
--- a/src/lxc/tools/lxc_config.c
+++ b/src/lxc/tools/lxc_config.c
@@ -64,7 +64,8 @@ int main(int argc, char *argv[])
 
 	setenv("LXC_UPDATE_CONFIG_FORMAT", "1", 0);
 
-	if (argc < 2)
+	if (argc < 2 || strcmp(argv[1], "-h") == 0 ||
+			strcmp(argv[1], "--help") == 0)
 		usage(argv[0]);
 	if (strcmp(argv[1], "-l") == 0)
 		list_config_items();