diff -r 2072fed2f583 -r 436183eb30c8 src/events/SDL_keyboard.c
--- a/src/events/SDL_keyboard.c	Tue Jul 13 15:05:45 2010 -0400
+++ b/src/events/SDL_keyboard.c	Sun Jul 18 13:48:23 2010 -0400
@@ -551,6 +551,10 @@
 int
 SDL_KeyboardInit(void)
 {
+    SDL_Keyboard *keyboard = &SDL_keyboard;
+
+    /* Set the default keymap */
+    SDL_memcpy(keyboard->keymap, SDL_default_keymap, sizeof(SDL_default_keymap));
     return (0);
 }
 
@@ -760,6 +764,11 @@
     SDL_Keyboard *keyboard = &SDL_keyboard;
     int posted;
 
+    /* Don't post text events for unprintable characters */
+    if (*text < ' ') {
+        return 0;
+    }
+
     /* Post the event, if desired */
     posted = 0;
     if (SDL_GetEventState(SDL_TEXTINPUT) == SDL_ENABLE) {