diff --git a/.travis.yml b/.travis.yml
index 505d56b40..d5918dc8d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,3 +49,5 @@ addons:
     - git
     - libgnome-keyring-dev
     - rpm
+    - libx11-dev
+    - libxkbfile-dev
diff --git a/docs/build-instructions/linux.md b/docs/build-instructions/linux.md
index fb7e96bef..a05bbff16 100644
--- a/docs/build-instructions/linux.md
+++ b/docs/build-instructions/linux.md
@@ -36,7 +36,7 @@ To also install the newly built application, use `--create-debian-package` or `-
 * Install GNOME headers and other basic prerequisites:
 
   ```sh
-  sudo apt-get install build-essential git libgnome-keyring-dev fakeroot rpm
+  sudo apt-get install build-essential git libgnome-keyring-dev fakeroot rpm libx11-dev libxkbfile-dev
   ```
 
 * If `script/build` exits with an error, you may need to install a newer C++ compiler with C++11:
@@ -51,11 +51,11 @@ To also install the newly built application, use `--create-debian-package` or `-
 
 ### Fedora / CentOS / RHEL
 
-* `sudo dnf --assumeyes install make gcc gcc-c++ glibc-devel git-core libgnome-keyring-devel rpmdevtools`
+* `sudo dnf --assumeyes install make gcc gcc-c++ glibc-devel git-core libgnome-keyring-devel rpmdevtools libX11-devel libxkbfile-devel`
 
 ### Arch
 
-* `sudo pacman -S --needed gconf base-devel git nodejs npm libgnome-keyring python2`
+* `sudo pacman -S --needed gconf base-devel git nodejs npm libgnome-keyring python2 libX11-devel libxkbfile-devel`
 * `export PYTHON=/usr/bin/python2` before building Atom.
 
 ### Slackware
@@ -64,7 +64,7 @@ To also install the newly built application, use `--create-debian-package` or `-
 
 ### openSUSE
 
-* `sudo zypper install nodejs nodejs-devel make gcc gcc-c++ glibc-devel git-core libgnome-keyring-devel rpmdevtools`
+* `sudo zypper install nodejs nodejs-devel make gcc gcc-c++ glibc-devel git-core libgnome-keyring-devel rpmdevtools libX11-devel libxkbfile-devel`
 
 
 ## Troubleshooting
diff --git a/package.json b/package.json
index 7ce36478c..9007260cf 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
   "electronVersion": "1.3.6",
   "dependencies": {
     "async": "0.2.6",
-    "atom-keymap": "7.0.6",
+    "atom-keymap": "7.0.7",
     "atom-ui": "0.4.1",
     "babel-core": "5.8.38",
     "cached-run-in-this-context": "0.4.1",