diff --git a/app/gen_misc.bat b/app/gen_misc.bat
index fb9c5d0e..31287851 100644
--- a/app/gen_misc.bat
+++ b/app/gen_misc.bat
@@ -7,13 +7,13 @@ del /F ..\bin\eagle.app.v6.flash.bin ..\bin\eagle.app.v6.irom0text.bin ..\bin\ea
 
 cd .output\eagle\debug\image
 
-xt-objdump -x -s eagle.app.v6.out > ..\..\..\..\..\bin\eagle.app.v6.dump
-xt-objdump -S eagle.app.v6.out > ..\..\..\..\..\bin\eagle.app.v6.S
+xtensa-lx106-elf-objdump -x -s eagle.app.v6.out > ..\..\..\..\..\bin\eagle.app.v6.dump
+xtensa-lx106-elf-objdump -S eagle.app.v6.out > ..\..\..\..\..\bin\eagle.app.v6.S
 
-xt-objcopy --only-section .text -O binary eagle.app.v6.out eagle.app.v6.text.bin
-xt-objcopy --only-section .data -O binary eagle.app.v6.out eagle.app.v6.data.bin
-xt-objcopy --only-section .rodata -O binary eagle.app.v6.out eagle.app.v6.rodata.bin
-xt-objcopy --only-section .irom0.text -O binary eagle.app.v6.out eagle.app.v6.irom0text.bin
+xtensa-lx106-elf-objcopy --only-section .text -O binary eagle.app.v6.out eagle.app.v6.text.bin
+xtensa-lx106-elf-objcopy --only-section .data -O binary eagle.app.v6.out eagle.app.v6.data.bin
+xtensa-lx106-elf-objcopy --only-section .rodata -O binary eagle.app.v6.out eagle.app.v6.rodata.bin
+xtensa-lx106-elf-objcopy --only-section .irom0.text -O binary eagle.app.v6.out eagle.app.v6.irom0text.bin
 
 gen_appbin.py eagle.app.v6.out v6
 
diff --git a/app/gen_misc.sh b/app/gen_misc.sh
index eeada235..6ddf62af 100755
--- a/app/gen_misc.sh
+++ b/app/gen_misc.sh
@@ -5,13 +5,13 @@ rm ../bin/eagle.app.v6.flash.bin ../bin/eagle.app.v6.irom0text.bin ../bin/eagle.
 
 cd .output/eagle/debug/image
 
-xt-objdump -x -s eagle.app.v6.out > ../../../../../bin/eagle.app.v6.dump
-xt-objdump -S eagle.app.v6.out > ../../../../../bin/eagle.app.v6.S
+xtensa-lx106-elf-objdump -x -s eagle.app.v6.out > ../../../../../bin/eagle.app.v6.dump
+xtensa-lx106-elf-objdump -S eagle.app.v6.out > ../../../../../bin/eagle.app.v6.S
 
-xt-objcopy --only-section .text -O binary eagle.app.v6.out eagle.app.v6.text.bin
-xt-objcopy --only-section .data -O binary eagle.app.v6.out eagle.app.v6.data.bin
-xt-objcopy --only-section .rodata -O binary eagle.app.v6.out eagle.app.v6.rodata.bin
-xt-objcopy --only-section .irom0.text -O binary eagle.app.v6.out eagle.app.v6.irom0text.bin
+xtensa-lx106-elf-objcopy --only-section .text -O binary eagle.app.v6.out eagle.app.v6.text.bin
+xtensa-lx106-elf-objcopy --only-section .data -O binary eagle.app.v6.out eagle.app.v6.data.bin
+xtensa-lx106-elf-objcopy --only-section .rodata -O binary eagle.app.v6.out eagle.app.v6.rodata.bin
+xtensa-lx106-elf-objcopy --only-section .irom0.text -O binary eagle.app.v6.out eagle.app.v6.irom0text.bin
 
 ../../../../../tools/gen_appbin.py eagle.app.v6.out v6
 
diff --git a/app/gen_misc_plus.bat b/app/gen_misc_plus.bat
index 3aaea129..f17ff345 100644
--- a/app/gen_misc_plus.bat
+++ b/app/gen_misc_plus.bat
@@ -7,10 +7,10 @@ rm ..\bin\upgrade\%1.bin
 
 cd .output\eagle\debug\image\
 
-xt-objcopy --only-section .text -O binary eagle.app.v6.out eagle.app.v6.text.bin
-xt-objcopy --only-section .data -O binary eagle.app.v6.out eagle.app.v6.data.bin
-xt-objcopy --only-section .rodata -O binary eagle.app.v6.out eagle.app.v6.rodata.bin
-xt-objcopy --only-section .irom0.text -O binary eagle.app.v6.out eagle.app.v6.irom0text.bin
+xtensa-lx106-elf-objcopy --only-section .text -O binary eagle.app.v6.out eagle.app.v6.text.bin
+xtensa-lx106-elf-objcopy --only-section .data -O binary eagle.app.v6.out eagle.app.v6.data.bin
+xtensa-lx106-elf-objcopy --only-section .rodata -O binary eagle.app.v6.out eagle.app.v6.rodata.bin
+xtensa-lx106-elf-objcopy --only-section .irom0.text -O binary eagle.app.v6.out eagle.app.v6.irom0text.bin
 
 gen_appbin.py eagle.app.v6.out v6
 
diff --git a/app/gen_misc_plus.sh b/app/gen_misc_plus.sh
index 7c4cb42e..e70a9385 100755
--- a/app/gen_misc_plus.sh
+++ b/app/gen_misc_plus.sh
@@ -6,13 +6,10 @@ rm ../bin/upgrade/user$1.bin ../bin/upgrade/user$1.dump ../bin/upgrade/user$1.S
 
 cd .output/eagle/debug/image/
 
-xt-objdump -x -s eagle.app.v6.out > ../../../../../bin/upgrade/user$1.dump
-xt-objdump -S eagle.app.v6.out > ../../../../../bin/upgrade/user$1.S
-
-xt-objcopy --only-section .text -O binary eagle.app.v6.out eagle.app.v6.text.bin
-xt-objcopy --only-section .data -O binary eagle.app.v6.out eagle.app.v6.data.bin
-xt-objcopy --only-section .rodata -O binary eagle.app.v6.out eagle.app.v6.rodata.bin
-xt-objcopy --only-section .irom0.text -O binary eagle.app.v6.out eagle.app.v6.irom0text.bin
+xtensa-lx106-elf-objcopy --only-section .text -O binary eagle.app.v6.out eagle.app.v6.text.bin
+xtensa-lx106-elf-objcopy --only-section .data -O binary eagle.app.v6.out eagle.app.v6.data.bin
+xtensa-lx106-elf-objcopy --only-section .rodata -O binary eagle.app.v6.out eagle.app.v6.rodata.bin
+xtensa-lx106-elf-objcopy --only-section .irom0.text -O binary eagle.app.v6.out eagle.app.v6.irom0text.bin
 
 ../../../../../tools/gen_appbin.py eagle.app.v6.out v6
 
diff --git a/tools/gen_appbin.py b/tools/gen_appbin.py
index 66019d15..603c7051 100755
--- a/tools/gen_appbin.py
+++ b/tools/gen_appbin.py
@@ -18,7 +18,7 @@ elf_file = sys.argv[1]
 ver = sys.argv[2]
 #print elf_file
 
-cmd = 'xt-nm -g ' + elf_file + ' > eagle.app.sym'
+cmd = 'xtensa-lx106-elf-nm -g ' + elf_file + ' > eagle.app.sym'
 #print cmd
 os.system(cmd)
 
@@ -60,6 +60,7 @@ for line in lines:
         rodata_start_addr = m.group(1)
         print rodata_start_addr
 
+# need to replace this with esptool.py
 cmd = 'genflashbin%s eagle.app.%s.text.bin '%(ver, ver)+entry_addr+' eagle.app.%s.data.bin '%(ver)+ data_start_addr+' eagle.app.%s.rodata.bin '%(ver)+rodata_start_addr
 
 print cmd