diff --git a/CMakeLists.txt b/CMakeLists.txt
index 14a988d..c0d81a8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,15 +97,10 @@ ELSEIF(NOT MAIKO_NETWORK_TYPE STREQUAL "NONE")
 OPTION(MAIKO_DISPLAY_SDL "Use SDL for display." ON)
 IF(MAIKO_DISPLAY_SDL)
   FIND_PACKAGE(SDL2 REQUIRED)
-  if(TARGET SDL2::SDL2)
-    set(SDLNAME SDL2::SDL2)
-  elseif(TARGET SDL)
-    set(SDLNAME SDL2)
-  endif()
   SET(MAIKO_DISPLAY_SDL_DEFINITIONS
     "-DSDL"
   )
-  SET(MAIKO_DISPLAY_SDL_LIBRARIES ${SDLNAME})
+  SET(MAIKO_DISPLAY_SDL_LIBRARIES ${SDL2_LIBRARIES})
   SET(MAIKO_DISPLAY_SDL_SRCS
     src/sdl.c
   )
@@ -436,8 +431,6 @@ ENDIF()
 IF(MAIKO_DISPLAY_SDL)
   # Tell it that the SDL launcher is available.
   TARGET_COMPILE_DEFINITIONS(lde PUBLIC ${MAIKO_DISPLAY_SDL_DEFINITIONS})
-  # This is needed so that it can call XOpenDisplay.
-  TARGET_LINK_LIBRARIES(lde ${SDLNAME})
 ENDIF()
 
 ADD_EXECUTABLE(ldeether src/ldeether.c src/dlpi.c)
@@ -471,6 +464,7 @@ IF(MAIKO_DISPLAY_SDL)
   )
   TARGET_COMPILE_DEFINITIONS(ldesdl PUBLIC ${MAIKO_DEFINITIONS} ${MAIKO_DISPLAY_SDL_DEFINITIONS})
   TARGET_INCLUDE_DIRECTORIES(ldesdl PUBLIC inc)
+  TARGET_INCLUDE_DIRECTORIES(ldesdl PRIVATE ${SDL2_INCLUDE_DIRS})
   TARGET_LINK_LIBRARIES(ldesdl ${MAIKO_LIBRARIES} ${MAIKO_DISPLAY_SDL_LIBRARIES})
 ENDIF()
 
diff --git a/src/sdl.c b/src/sdl.c
index bbff60b..89c87ac 100644
--- a/src/sdl.c
+++ b/src/sdl.c
@@ -347,6 +347,11 @@ void process_SDLevents() {
       break;
     case SDL_KEYDOWN:
       printf("dn ts: %x, type: %x, state: %x, repeat: %x, scancode: %x, sym: %x <%s>, mod: %x\n", event.key.timestamp, event.key.type, event.key.state, event.key.repeat, event.key.keysym.scancode, event.key.keysym.sym, SDL_GetKeyName(event.key.keysym.sym), event.key.keysym.mod);
+      // TODO: this produces *double* keys for me, need to fix that before using it
+      /* if (event.key.repeat) { */
+      /*   /\* Lisp needs to see the UP transition before the DOWN transition *\/ */
+      /*   handle_keyup(event.key.keysym.sym, event.key.keysym.mod); */
+      /* } */
       handle_keydown(event.key.keysym.sym, event.key.keysym.mod);
       break;
     case SDL_KEYUP: