diff --git a/ChangeLog b/ChangeLog
index e175b69..2327e6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2009-03-06  Johannes E. Schindelin  <Johannes.Schindelin@gmx.de>
+	* client_examples/SDLvncviewer.c: enable key repeat
+
 2009-02-03  Mike Frysinger <vapier@gentoo.org>
 	* autogen.sh, configure.ac, **/Makefile.am: major automake cleanups
 
diff --git a/TODO b/TODO
index f49cb8e..d1eee3f 100644
--- a/TODO
+++ b/TODO
@@ -5,7 +5,6 @@ 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,
-	- keyboard repeat,
 	- introduce scrollbars,
 	- handle selection
 style fixes: use Linux' coding guidelines & ANSIfy tightvnc-filetransfer:
diff --git a/client_examples/SDLvncviewer.c b/client_examples/SDLvncviewer.c
index d01c97d..791c308 100644
--- a/client_examples/SDLvncviewer.c
+++ b/client_examples/SDLvncviewer.c
@@ -242,6 +242,8 @@ int main(int argc,char** argv) {
 
 	SDL_Init(SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE);
 	SDL_EnableUNICODE(1);
+	SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY,
+			SDL_DEFAULT_REPEAT_INTERVAL);
 
 	/* 16-bit: cl=rfbGetClient(5,3,2); */
 	cl=rfbGetClient(8,3,4);