diff --git a/gamecontrollerdb.txt b/gamecontrollerdb.txt
index d33e2b8..f3f593a 100644
--- a/gamecontrollerdb.txt
+++ b/gamecontrollerdb.txt
@@ -611,3 +611,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 #MisterCade default mapping
 03000000d0160000be10000001010000,Mister Addons MiSTer JAMMA Board,dpright:h0.2,dpleft:h0.8,dpdown:h0.4,dpup:h0.1,menuok:b0,menuesc:b1,b:b3,a:b2,y:b0,x:b6,leftshoulder:b7,rightshoulder:b1,back:b8,start:b9,guide:b9,guide2:h0.4,platform:MiSTer 
 
+#Mister uses hid-nintendo. Gamecontrollerdb was built assuming hid-nx. They map the A and B buttons differently.
+#Restore sanity for mister.
+030000007e0500001920000011810000,NSO N64 Controller,+rightx:b10,+righty:b8,-rightx:b9,-righty:b7,a:b1,b:b0,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b11,leftshoulder:b3,lefttrigger:b2,leftx:a0,lefty:a1,misc1:b12,rightshoulder:b4,righttrigger:b5,start:b6,platform:Linux,
+050000007e0500001920000001800000,NSO N64 Controller,+rightx:b10,+righty:b8,-rightx:b9,-righty:b7,a:b1,b:b0,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b11,leftshoulder:b3,lefttrigger:b2,leftx:a0,lefty:a1,misc1:b12,rightshoulder:b4,righttrigger:b5,start:b6,platform:Linux,