diff --git a/tools/Makefile b/tools/Makefile
index b7f5c860d8..71fb6bff92 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -13,10 +13,10 @@ LDFLAGS := -g
 
 CLEANALL := scramble descramble iriver sh2d bmp2rb rdf2binary convbdf	\
  generate_rocklatin mkboot ipod_fw codepages uclpack mi4 gigabeat \
- lngdump telechips gigabeats creative hmac-sha1 mktccboot mknkboot rbspeexenc \
+ lngdump telechips gigabeats creative hmac-sha1 mktccboot rbspeexenc \
  mkzenboot mk500boot
 
-all: scramble descramble sh2d rdf2binary mkboot mktccboot mknkboot mkzenboot \
+all: scramble descramble sh2d rdf2binary mkboot mktccboot mkzenboot \
 	convbdf codepages uclpack rbspeexenc voicefont mk500boot
 
 scramble: scramble.o iriver.o mi4.o gigabeat.o gigabeats.o telechips.o iaudio_bl_flash.o creative.o hmac-sha1.o
@@ -52,9 +52,6 @@ mktccboot: mktccboot.c telechips.o
 mk500boot: mk500boot.c mr500.c
 	$(SILENT)$(CC) $(CFLAGS) $+ -o $@
 	
-mknkboot: mknkboot.c
-	$(SILENT)$(CC) $(CFLAGS) $+ -o $@
-
 mkzenboot.o: mkzenboot.c
 	$(SILENT)$(CC) $(CFLAGS) -DSTANDALONE -c -o $@ $+
 
diff --git a/tools/configure b/tools/configure
index 6a9415e7a3..c79d69570c 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1608,7 +1608,7 @@ fi
     appextra="recorder:gui"
     plugins="yes"
     swcodec="yes"
-    toolset="$gigabeatbitmaptools mknkboot"
+    toolset="$gigabeatbitmaptools"
     boottool="$rootdir/tools/scramble -gigabeats"
     bootoutput="nk.bin"
     # architecture, manufacturer and model for the target-tree build
diff --git a/utils/MTP/beastpatcher/Makefile b/utils/MTP/beastpatcher/Makefile
index 571274034b..bb908532c2 100644
--- a/utils/MTP/beastpatcher/Makefile
+++ b/utils/MTP/beastpatcher/Makefile
@@ -1,4 +1,4 @@
-CFLAGS=-Wall -W -DWITH_BOOTOBJS -DBEASTPATCHER -I../../../tools
+CFLAGS=-Wall -W -DWITH_BOOTOBJS -I../../../tools
 
 ifeq ($(findstring CYGWIN,$(shell uname)),CYGWIN)
 OUTPUT=beastpatcher.exe
@@ -30,17 +30,17 @@ CC = $(CROSS)gcc
 
 all: $(OUTPUT)
 
-SOURCES = beastpatcher.c bootimg.c ../../../tools/mknkboot.c main.c
-HEADERS = beastpatcher.h mtp_common.h bootimg.h ../../../tools/mknkboot.h
+SOURCES = beastpatcher.c bootimg.c mknkboot.c main.c
+HEADERS = beastpatcher.h mtp_common.h bootimg.h mknkboot.h
 MTPSRCS_W32 = mtp_win32.c
 MTPSRCS_MTP = mtp_libmtp.c
 
 beastpatcher: $(SOURCES) $(HEADERS) $(MTPSRCS_MTP)
-	gcc $(CFLAGS) -o beastpatcher $(SOURCES) $(MTPSRCS_MTP) $(LIBS)
+	gcc $(CFLAGS) -DBEASTPATCHER -o beastpatcher $(SOURCES) $(MTPSRCS_MTP) $(LIBS)
 	strip beastpatcher
 
 beastpatcher.exe: $(SOURCES) $(HEADERS) $(MTPSRCS_W32) $(WINLIBS)
-	$(CC) $(CFLAGS) -o beastpatcher.exe $(SOURCES) $(MTPSRCS_W32) $(WINLIBS)
+	$(CC) $(CFLAGS) -DBEASTPATCHER -o beastpatcher.exe $(SOURCES) $(MTPSRCS_W32) $(WINLIBS)
 	$(CROSS)strip beastpatcher.exe
 
 beastpatcher-mac: beastpatcher-i386 beastpatcher-ppc
@@ -60,5 +60,7 @@ bin2c: ../../../rbutil/tools/bin2c.c
 bootimg.c: bootloader.bin bin2c
 	./bin2c bootloader.bin bootimg
 
+mknkboot: mknkboot.c
+	$(SILENT)$(NATIVECC) $(CFLAGS) $+ -o $@
 clean:
-	rm -f beastpatcher.exe beastpatcher-mac beastpatcher-i386 beastpatcher-ppc beastpatcher bin2c bootimg.c bootimg.h *~
+	rm -f beastpatcher.exe beastpatcher-mac beastpatcher-i386 beastpatcher-ppc beastpatcher bin2c bootimg.c bootimg.h mknkboot *~
diff --git a/tools/mknkboot.c b/utils/MTP/beastpatcher/mknkboot.c
similarity index 100%
rename from tools/mknkboot.c
rename to utils/MTP/beastpatcher/mknkboot.c
diff --git a/tools/mknkboot.h b/utils/MTP/beastpatcher/mknkboot.h
similarity index 100%
rename from tools/mknkboot.h
rename to utils/MTP/beastpatcher/mknkboot.h