diff --git a/ChangeLog b/ChangeLog
index 10b52bb..82a6662 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-03-07  Johannes E. Schindelin  <Johannes.Schindelin@gmx.de>
+	* client_examples/SDLvncviewer.c: force releasing Alt keys whenr
+	  losing focus.  This helps when you switch windows by pressing
+	  Alt+Tab (SDLvncviewer would get the "Alt down" event, but not
+	  the "Alt up" one).
+
 2009-03-07  Johannes E. Schindelin  <Johannes.Schindelin@gmx.de>
 	* client_examples/SDLvncviewer.c: make the viewer resizable
 
diff --git a/TODO b/TODO
index a6c1fdf..2afffc8 100644
--- a/TODO
+++ b/TODO
@@ -2,7 +2,6 @@ immediate:
 ----------
 
 make SDLvncviewer more versatile
-	- Send modifiers key-up on leave focus,
 	- test for missing keys (especially "[]{}" with ./examples/mac),
 	- map Apple/Linux/Windows keys onto each other,
 	- handle selection
diff --git a/client_examples/SDLvncviewer.c b/client_examples/SDLvncviewer.c
index 738e9c6..6fe1a17 100644
--- a/client_examples/SDLvncviewer.c
+++ b/client_examples/SDLvncviewer.c
@@ -17,6 +17,8 @@ static int enableResizable, viewOnly, buttonMask;
 static int realWidth, realHeight, bytesPerPixel, rowStride;
 static char *sdlPixels;
 
+static int rightAltKeyDown, leftAltKeyDown;
+
 static rfbBool resize(rfbClient* client) {
 	static char first=TRUE;
 	int width=client->width,height=client->height,
@@ -376,11 +378,25 @@ static void handleSDLEvent(rfbClient *cl, SDL_Event *e)
 			break;
 		SendKeyEvent(cl, SDL_key2rfbKeySym(&e->key),
 			e->type == SDL_KEYDOWN ? TRUE : FALSE);
+		if (e->key.keysym.sym == SDLK_RALT)
+			rightAltKeyDown = e->type == SDL_KEYDOWN;
+		if (e->key.keysym.sym == SDLK_LALT)
+			leftAltKeyDown = e->type == SDL_KEYDOWN;
 		break;
 	case SDL_QUIT:
 		rfbClientCleanup(cl);
 		exit(0);
 	case SDL_ACTIVEEVENT:
+		if (!e->active.gain && rightAltKeyDown) {
+			SendKeyEvent(cl, XK_Alt_R, FALSE);
+			rightAltKeyDown = FALSE;
+			rfbClientLog("released right Alt key\n");
+		}
+		if (!e->active.gain && leftAltKeyDown) {
+			SendKeyEvent(cl, XK_Alt_L, FALSE);
+			leftAltKeyDown = FALSE;
+			rfbClientLog("released left Alt key\n");
+		}
 		break;
 	case SDL_VIDEORESIZE:
 		setRealDimension(cl, e->resize.w, e->resize.h);