diff --git a/lib/blkid/probe.c b/lib/blkid/probe.c
index 5f5e06be..615cc38c 100644
--- a/lib/blkid/probe.c
+++ b/lib/blkid/probe.c
@@ -900,6 +900,8 @@ static struct blkid_magic type_array[] = {
   { "ocfs2",	 4,	 0,  6,	"OCFSV2",		probe_ocfs2 },
   { "ocfs2",	 8,	 0,  6,	"OCFSV2",		probe_ocfs2 },
   { "crypt_LUKS", 0,	 0,  6,	"LUKS\xba\xbe",		probe_luks },
+  { "squashfs",	 0,	 0,  4,	"sqsh",			0 },
+  { "squashfs",	 0,	 0,  4,	"hsqs",			0 },
   {   NULL,	 0,	 0,  0, NULL,			NULL }
 };
 
diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index be40fcdb..98a49572 100644
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -100,7 +100,7 @@ static void usage(void)
 	"\t[-N number-of-inodes] [-m reserved-blocks-percentage] "
 	"[-o creator-os]\n\t[-g blocks-per-group] [-L volume-label] "
 	"[-M last-mounted-directory]\n\t[-O feature[,...]] "
-	"[-r fs-revision] [-R options] [-qvSV]\n\tdevice [blocks-count]\n"),
+	"[-r fs-revision] [-E extended-option[,...]] [-qvSV]\n\tdevice [blocks-count]\n"),
 		program_name);
 	exit(1);
 }