diff --git a/ChangeLog b/ChangeLog
index 7c06eb5..0651240 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-02  Johannes E. Schindelin  <Johannes.Schindelin@gmx.de>
+	* client_examples/SDLvncviewer.c: fix buttons (2 & 3 were switched),
+		fix Tab key, and fix Ctrl+<letter>
+
 2008-01-29  Christian Ehrlicher <Ch.Ehrlicher@gmx.de>
 	* libvncserver/rfbserver.c: add missing #include <time.h>
 
diff --git a/TODO b/TODO
index 8b1dd69..9dbc359 100644
--- a/TODO
+++ b/TODO
@@ -4,7 +4,6 @@ immediate:
 Implement ZYWRLE decoding in libvncclient
 make SDLvncviewer more versatile (test for missing keys, introduce scrollbars,
 	make scrollable with 2xCtrl and mouse drag)
-	- 2nd and 3rd mouse button are switched
 Clean up ZRLE (probably not thread-safe: zrleBeforeBuf, zrlePaletteHelper)
 style fixes: use Linux' coding guidelines & ANSIfy tightvnc-filetransfer:
 	discuss on list
diff --git a/client_examples/SDLvncviewer.c b/client_examples/SDLvncviewer.c
index 4154887..8a006fd 100644
--- a/client_examples/SDLvncviewer.c
+++ b/client_examples/SDLvncviewer.c
@@ -3,8 +3,8 @@
 
 struct { int sdl; int rfb; } buttonMapping[]={
 	{1, rfbButton1Mask},
-	{3, rfbButton2Mask},
-	{2, rfbButton3Mask},
+	{2, rfbButton2Mask},
+	{3, rfbButton3Mask},
 	{0,0}
 };