diff --git a/gdb/config/z8k/tm-z8k.h b/gdb/config/z8k/tm-z8k.h
index 898ead95d4c..3f3d84c9bfd 100644
--- a/gdb/config/z8k/tm-z8k.h
+++ b/gdb/config/z8k/tm-z8k.h
@@ -274,8 +274,8 @@ extern void z8k_pop_frame PARAMS ((void));
 #define SP_ARG0 (1 * 4)
 
 #define ADDR_BITS_REMOVE(x) addr_bits_remove(x)
-int z8001_mode;
-#define BIG (z8001_mode)
+int sim_z8001_mode;
+#define BIG (sim_z8001_mode)
 
 #define read_memory_short(x)  (read_memory_integer(x,2) & 0xffff)
 
diff --git a/gdb/config/z8k/z8ksim.mt b/gdb/config/z8k/z8ksim.mt
index 095dd660fe8..79487ffb9fa 100644
--- a/gdb/config/z8k/z8ksim.mt
+++ b/gdb/config/z8k/z8ksim.mt
@@ -1,3 +1,3 @@
 # Target: Z8000 simulator
-TDEPFILES= exec.o z8k-tdep.o  remote-z8k.o ../sim/z8k/libsim.a ../opcodes/libopcodes.a
+TDEPFILES= exec.o z8k-tdep.o  remote-sim.o  ../sim/z8k/libsim.a ../opcodes/libopcodes.a
 TM_FILE= tm-z8k.h