diff --git a/Makefile b/Makefile
index dbb49cfd..c8d614c0 100644
--- a/Makefile
+++ b/Makefile
@@ -138,7 +138,7 @@ objects = ctree.o disk-io.o kernel-lib/radix-tree.o extent-tree.o print-tree.o \
 cmds_objects = cmds-subvolume.o cmds-filesystem.o cmds-device.o cmds-scrub.o \
 	       cmds-inspect.o cmds-balance.o cmds-send.o cmds-receive.o \
 	       cmds/quota.o cmds/qgroup.o cmds-replace.o check/main.o \
-	       cmds-restore.o cmds-rescue.o chunk-recover.o super-recover.o \
+	       cmds-restore.o cmds/rescue.o chunk-recover.o super-recover.o \
 	       cmds-property.o cmds-fi-usage.o cmds-inspect-dump-tree.o \
 	       cmds-inspect-dump-super.o cmds-inspect-tree-stats.o cmds-fi-du.o \
 	       mkfs/common.o check/mode-common.o check/mode-lowmem.o
diff --git a/chunk-recover.c b/chunk-recover.c
index f3e7774e..03db9e4a 100644
--- a/chunk-recover.c
+++ b/chunk-recover.c
@@ -40,7 +40,7 @@
 #include "utils.h"
 #include "btrfsck.h"
 #include "commands.h"
-#include "rescue.h"
+#include "cmds/rescue.h"
 
 struct recover_control {
 	int verbose;
diff --git a/cmds-rescue.c b/cmds/rescue.c
similarity index 99%
rename from cmds-rescue.c
rename to cmds/rescue.c
index 36aa05c3..1b93a5c4 100644
--- a/cmds-rescue.c
+++ b/cmds/rescue.c
@@ -26,7 +26,7 @@
 #include "commands.h"
 #include "utils.h"
 #include "help.h"
-#include "rescue.h"
+#include "cmds/rescue.h"
 
 static const char * const rescue_cmd_group_usage[] = {
 	"btrfs rescue <command> [options] <path>",
diff --git a/rescue.h b/cmds/rescue.h
similarity index 100%
rename from rescue.h
rename to cmds/rescue.h
diff --git a/super-recover.c b/super-recover.c
index a1af7178..b18b7f19 100644
--- a/super-recover.c
+++ b/super-recover.c
@@ -34,7 +34,7 @@
 #include "crc32c.h"
 #include "volumes.h"
 #include "commands.h"
-#include "rescue.h"
+#include "cmds/rescue.h"
 
 struct btrfs_recover_superblock {
 	struct btrfs_fs_devices *fs_devices;