diff --git a/src/devices/cpu/z8/z8.cpp b/src/devices/cpu/z8/z8.cpp
index 8f5a00f748f..950600adc6c 100644
--- a/src/devices/cpu/z8/z8.cpp
+++ b/src/devices/cpu/z8/z8.cpp
@@ -176,8 +176,8 @@ ADDRESS_MAP_END
 
 z8_device::z8_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint32_t rom_size, address_map_constructor map)
 	: cpu_device(mconfig, type, tag, owner, clock)
-	, m_program_config("program", ENDIANNESS_LITTLE, 8, 16, 0, map)
-	, m_data_config("data", ENDIANNESS_LITTLE, 8, 16, 0)
+	, m_program_config("program", ENDIANNESS_BIG, 8, 16, 0, map)
+	, m_data_config("data", ENDIANNESS_BIG, 8, 16, 0)
 	, m_input_cb{{*this}, {*this}, {*this}, {*this}}
 	, m_output_cb{{*this}, {*this}, {*this}, {*this}}
 	, m_rom_size(rom_size)
@@ -539,7 +539,7 @@ void z8_device::stack_push_word(uint16_t src)
 		register_pair_write(Z8_REGISTER_SPH, sp);
 
 		// @SP <- src
-		m_data->write_word(mask_external_address(sp), src);
+		m_data->write_word_unaligned(mask_external_address(sp), src);
 	}
 }
 
@@ -586,7 +586,7 @@ uint16_t z8_device::stack_pop_word()
 	{
 		// @SP <- src
 		uint16_t sp = register_pair_read(Z8_REGISTER_SPH);
-		uint16_t word = m_data->read_word(mask_external_address(sp));
+		uint16_t word = m_data->read_word_unaligned(mask_external_address(sp));
 
 		// SP <- SP + 2 (postincrement)
 		register_pair_write(Z8_REGISTER_SPH, sp + 2);
diff --git a/src/tools/unidasm.cpp b/src/tools/unidasm.cpp
index 49d011765d0..25e2452ac7f 100644
--- a/src/tools/unidasm.cpp
+++ b/src/tools/unidasm.cpp
@@ -471,7 +471,7 @@ static const dasm_table_entry dasm_table[] =
 	{ "x86_64",          le,  0, []() -> util::disasm_interface * { i386_unidasm.mode = 64; return new i386_disassembler(&i386_unidasm); } },
 	{ "xavix",           le,  0, []() -> util::disasm_interface * { return new xavix_disassembler; } },
 	{ "z180",            le,  0, []() -> util::disasm_interface * { return new z180_disassembler; } },
-	{ "z8",              le,  0, []() -> util::disasm_interface * { return new z8_disassembler; } },
+	{ "z8",              be,  0, []() -> util::disasm_interface * { return new z8_disassembler; } },
 	{ "z80",             le,  0, []() -> util::disasm_interface * { return new z80_disassembler; } },
 	{ "z8000",           be,  0, []() -> util::disasm_interface * { return new z8000_disassembler(&z8000_unidasm); } },
 };