diff --git a/rbutil/mkimxboot/Makefile b/rbutil/mkimxboot/Makefile
index 41581c312d..0172ae97f0 100644
--- a/rbutil/mkimxboot/Makefile
+++ b/rbutil/mkimxboot/Makefile
@@ -6,7 +6,7 @@
 #                     \/            \/     \/    \/            \/
 
 # We use the SB code available in the Rockbox utils/sbtools directory
-IMXTOOLS_DIR=../../utils/imxtools/
+IMXTOOLS_DIR=../../utils/imxtools/sbtools/
 CFLAGS += -I$(IMXTOOLS_DIR) -Wall
 CFLAGS += -std=c99 -g
 
diff --git a/utils/imxtools/Makefile b/utils/imxtools/sbtools/Makefile
similarity index 100%
rename from utils/imxtools/Makefile
rename to utils/imxtools/sbtools/Makefile
diff --git a/utils/imxtools/README b/utils/imxtools/sbtools/README
similarity index 100%
rename from utils/imxtools/README
rename to utils/imxtools/sbtools/README
diff --git a/utils/imxtools/aes128.c b/utils/imxtools/sbtools/aes128.c
similarity index 100%
rename from utils/imxtools/aes128.c
rename to utils/imxtools/sbtools/aes128.c
diff --git a/utils/imxtools/crc.c b/utils/imxtools/sbtools/crc.c
similarity index 100%
rename from utils/imxtools/crc.c
rename to utils/imxtools/sbtools/crc.c
diff --git a/utils/imxtools/crypto.c b/utils/imxtools/sbtools/crypto.c
similarity index 100%
rename from utils/imxtools/crypto.c
rename to utils/imxtools/sbtools/crypto.c
diff --git a/utils/imxtools/crypto.h b/utils/imxtools/sbtools/crypto.h
similarity index 100%
rename from utils/imxtools/crypto.h
rename to utils/imxtools/sbtools/crypto.h
diff --git a/utils/imxtools/dbparser.c b/utils/imxtools/sbtools/dbparser.c
similarity index 100%
rename from utils/imxtools/dbparser.c
rename to utils/imxtools/sbtools/dbparser.c
diff --git a/utils/imxtools/dbparser.h b/utils/imxtools/sbtools/dbparser.h
similarity index 100%
rename from utils/imxtools/dbparser.h
rename to utils/imxtools/sbtools/dbparser.h
diff --git a/utils/imxtools/elf.c b/utils/imxtools/sbtools/elf.c
similarity index 100%
rename from utils/imxtools/elf.c
rename to utils/imxtools/sbtools/elf.c
diff --git a/utils/imxtools/elf.h b/utils/imxtools/sbtools/elf.h
similarity index 100%
rename from utils/imxtools/elf.h
rename to utils/imxtools/sbtools/elf.h
diff --git a/utils/imxtools/elftosb.c b/utils/imxtools/sbtools/elftosb.c
similarity index 100%
rename from utils/imxtools/elftosb.c
rename to utils/imxtools/sbtools/elftosb.c
diff --git a/utils/imxtools/fuze+_key_file.txt b/utils/imxtools/sbtools/fuze+_key_file.txt
similarity index 100%
rename from utils/imxtools/fuze+_key_file.txt
rename to utils/imxtools/sbtools/fuze+_key_file.txt
diff --git a/utils/imxtools/misc.c b/utils/imxtools/sbtools/misc.c
similarity index 100%
rename from utils/imxtools/misc.c
rename to utils/imxtools/sbtools/misc.c
diff --git a/utils/imxtools/misc.h b/utils/imxtools/sbtools/misc.h
similarity index 100%
rename from utils/imxtools/misc.h
rename to utils/imxtools/sbtools/misc.h
diff --git a/utils/imxtools/sb.c b/utils/imxtools/sbtools/sb.c
similarity index 100%
rename from utils/imxtools/sb.c
rename to utils/imxtools/sbtools/sb.c
diff --git a/utils/imxtools/sb.h b/utils/imxtools/sbtools/sb.h
similarity index 100%
rename from utils/imxtools/sb.h
rename to utils/imxtools/sbtools/sb.h
diff --git a/utils/imxtools/sbloader.c b/utils/imxtools/sbtools/sbloader.c
similarity index 100%
rename from utils/imxtools/sbloader.c
rename to utils/imxtools/sbtools/sbloader.c
diff --git a/utils/imxtools/sbtoelf.c b/utils/imxtools/sbtools/sbtoelf.c
similarity index 100%
rename from utils/imxtools/sbtoelf.c
rename to utils/imxtools/sbtools/sbtoelf.c
diff --git a/utils/imxtools/sha1.c b/utils/imxtools/sbtools/sha1.c
similarity index 100%
rename from utils/imxtools/sha1.c
rename to utils/imxtools/sbtools/sha1.c