diff --git a/Machines/Amiga/Chipset.cpp b/Machines/Amiga/Chipset.cpp
index 9631c11bc..f8c8d46d8 100644
--- a/Machines/Amiga/Chipset.cpp
+++ b/Machines/Amiga/Chipset.cpp
@@ -58,7 +58,7 @@ void Chipset::perform(const CPU::MC68000::Microcycle &cycle) {
 			assert(false);
 		break;
 
-		// Position polling.
+		// Raster position.
 		case Read(0x004): {
 			const uint16_t position = uint16_t(y_ >> 8);
 			LOG("Read vertical position high " << PADHEX(4) << position);
@@ -77,6 +77,13 @@ void Chipset::perform(const CPU::MC68000::Microcycle &cycle) {
 			LOG("TODO: write vertical position low " << PADHEX(4) << cycle.value16());
 		break;
 
+		// Joystick/mouse input.
+		case Read(0x00a):
+		case Read(0x00c):
+			LOG("TODO: Joystick/mouse position " << PADHEX(4) << *cycle.address);
+			cycle.set_value16(0x8080);
+		break;
+
 		// Disk DMA.
 		case Write(0x020):	case Write(0x022):	case Write(0x024):
 		case Write(0x026):