diff --git a/convert/main.c b/convert/main.c
index 68f76f71..01090b98 100644
--- a/convert/main.c
+++ b/convert/main.c
@@ -101,6 +101,7 @@
 #include "mkfs/common.h"
 #include "convert/common.h"
 #include "convert/source-fs.h"
+#include "kernel-lib/crc32c.h"
 #include "fsfeatures.h"
 
 extern const struct btrfs_convert_operations ext2_convert_ops;
@@ -1727,6 +1728,8 @@ int main(int argc, char *argv[])
 	char fslabel[BTRFS_LABEL_SIZE];
 	u64 features = BTRFS_MKFS_DEFAULT_FEATURES;
 
+	crc32c_optimization_init();
+
 	while(1) {
 		enum { GETOPT_VAL_NO_PROGRESS = 256 };
 		static const struct option long_options[] = {
diff --git a/mkfs/main.c b/mkfs/main.c
index b442e6e4..6b47a9ee 100644
--- a/mkfs/main.c
+++ b/mkfs/main.c
@@ -42,6 +42,7 @@
 #include "rbtree-utils.h"
 #include "mkfs/common.h"
 #include "mkfs/rootdir.h"
+#include "kernel-lib/crc32c.h"
 #include "fsfeatures.h"
 
 static int verbose = 1;
@@ -811,6 +812,8 @@ int main(int argc, char **argv)
 	struct mkfs_allocation allocation = { 0 };
 	struct btrfs_mkfs_config mkfs_cfg;
 
+	crc32c_optimization_init();
+
 	while(1) {
 		int c;
 		enum { GETOPT_VAL_SHRINK = 257 };