diff --git a/debian/control b/debian/control
index a3411335a..ac45d5a8f 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,10 @@ Build-Depends: debhelper (>= 9),
                dpkg-dev (>= 1.16.1~),
                fcitx-libs-dev [linux-any],
                libasound2-dev [linux-any],
+               libegl1-mesa-dev,
                libgl1-mesa-dev,
+               libgles2-mesa-dev,
+               libglu1-mesa-dev,
                libpulse-dev,
                libudev-dev [linux-any],
                libdbus-1-dev [linux-any],
@@ -30,16 +33,16 @@ Build-Depends: debhelper (>= 9),
                libxxf86vm-dev
 Homepage: http://www.libsdl.org/
 
-Package: libsdl2
+Package: libsdl2-2.0-0
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         libudev0 [linux-any],
+         libudev0 | libudev1 [linux-any],
          libdbus-1-3 [linux-any]
-Conflicts: libsdl-1.3-0
-Replaces: libsdl-1.3-0
+Conflicts: libsdl-1.3-0, libsdl2
+Replaces: libsdl-1.3-0, libsdl2
 Description: Simple DirectMedia Layer
  SDL is a library that allows programs portable low level access to
  a video framebuffer, audio output, mouse, and keyboard.
@@ -51,7 +54,7 @@ Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends},
-         libsdl2 (= ${binary:Version}),
+         libsdl2-2.0-0 (= ${binary:Version}),
          libc6-dev,
          libgl1-mesa-dev
 Conflicts: libsdl-1.3-dev
@@ -68,7 +71,7 @@ Section: debug
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends},
-         libsdl2 (= ${binary:Version}),
+         libsdl2-2.0-0 (= ${binary:Version}),
 Description: Simple DirectMedia Layer debug files
  SDL is a library that allows programs portable low level access to a video
  framebuffer, audio output, mouse, and keyboard.
diff --git a/debian/libsdl2.install b/debian/libsdl2-2.0-0.install
similarity index 100%
rename from debian/libsdl2.install
rename to debian/libsdl2-2.0-0.install
diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c
index 06a2d9a21..81be5d843 100644
--- a/src/joystick/linux/SDL_sysjoystick.c
+++ b/src/joystick/linux/SDL_sysjoystick.c
@@ -670,7 +670,7 @@ ConfigJoystick(SDL_Joystick * joystick, int fd)
                 ++joystick->nbuttons;
             }
         }
-        for (i = 0; i < ABS_MAX; ++i) {
+        for (i = 0; i < ABS_MISC; ++i) {
             /* Skip hats */
             if (i == ABS_HAT0X) {
                 i = ABS_HAT3Y;
@@ -976,6 +976,10 @@ HandleInputEvents(SDL_Joystick * joystick)
                                           events[i].value);
                 break;
             case EV_ABS:
+                if (code >= ABS_MISC) {
+                    break;
+                }
+
                 switch (code) {
                 case ABS_HAT0X:
                 case ABS_HAT0Y: