diff --git a/bcachefs.c b/bcachefs.c
index 910e0b16..304a01bb 100644
--- a/bcachefs.c
+++ b/bcachefs.c
@@ -194,6 +194,11 @@ int main(int argc, char *argv[])
 	if (!strcmp(cmd, "list"))
 		return cmd_list(argc, argv);
 
+	if (!strcmp(cmd, "--help")) {
+		usage();
+		return 0;
+	}
+
 	printf("Unknown command %s\n", cmd);
 	usage();
 	exit(EXIT_FAILURE);
diff --git a/initramfs/hook b/initramfs/hook
index aa91469e..404a2499 100755
--- a/initramfs/hook
+++ b/initramfs/hook
@@ -16,3 +16,9 @@ esac
 
 . /usr/share/initramfs-tools/hook-functions
 
+manual_add_modules 'bcachefs'
+
+# chacha20 and poly1305 are used for encrypted bcachefs filesystems.
+add_loaded_modules 'chacha20[-_]*'
+add_loaded_modules 'poly1305[-_]*'
+