diff --git a/waterbox/uae/bizhawk.c b/waterbox/uae/bizhawk.c
index 2bac63f6831..5800c301977 100644
--- a/waterbox/uae/bizhawk.c
+++ b/waterbox/uae/bizhawk.c
@@ -77,10 +77,13 @@ ECL_EXPORT void FrameAdvance(MyFrameInfo* f)
 				joymousecounter(port);
 				break;
 			case CONTROLLER_MOUSE:
-				setmousestate(port, AXIS_HORIZONTAL, controller->MouseX - last_mouse_x[port], MOUSE_RELATIVE);
-				setmousestate(port, AXIS_VERTICAL,   controller->MouseY - last_mouse_y[port], MOUSE_RELATIVE);
+				mouse_delta[port][AXIS_HORIZONTAL] = controller->MouseX - last_mouse_x[port];
+				mouse_delta[port][AXIS_VERTICAL]   = controller->MouseY - last_mouse_y[port];
 				break;
 		}
+
+		mouse_deltanoreset[port][0] = 1;
+		mouse_deltanoreset[port][1] = 1;
 	}
 
 	for (int i = 0; i < KEY_COUNT; i++)
diff --git a/waterbox/uae/bizhawk.h b/waterbox/uae/bizhawk.h
index f356cf9712a..d7e1e41fbf0 100644
--- a/waterbox/uae/bizhawk.h
+++ b/waterbox/uae/bizhawk.h
@@ -39,6 +39,8 @@ extern int retro_max_diwlastword;
 extern int cd32_pad_enabled[NORMAL_JPORTS];
 extern int joybutton[MAX_JPORTS];
 extern int joydir[MAX_JPORTS];
+extern uae_s16 mouse_delta[MAX_JPORTS][4];
+extern uae_s16 mouse_deltanoreset[MAX_JPORTS][4];
 
 extern int umain(int argc, char **argv);
 extern int m68k_go(int may_quit, int resume);
diff --git a/waterbox/uae/libretro-uae b/waterbox/uae/libretro-uae
index 79fa9cd5a06..2f943b3bd50 160000
--- a/waterbox/uae/libretro-uae
+++ b/waterbox/uae/libretro-uae
@@ -1 +1 @@
-Subproject commit 79fa9cd5a067713a4e5e51472b9bca1f7e499bc8
+Subproject commit 2f943b3bd507608dbbea1798d69b1017ba899698