diff --git a/README.md b/README.md
index 9f20c02..a14c0a2 100644
--- a/README.md
+++ b/README.md
@@ -131,6 +131,7 @@ See code for all available configurations.
 | Lenovo ThinkPad X1 Extreme Gen 2  | `<nixos-hardware/lenovo/thinkpad/x1-extreme/gen2>` |
 | [Microsoft Surface Range][]       | `<nixos-hardware/microsoft/surface>`               |
 | [Microsoft Surface Pro 3][]       | `<nixos-hardware/microsoft/surface-pro/3>`         |
+| [MSI GS60 2QE][]                  | `<nixos-hardware/msi/gs60>`                        |
 | PC Engines APU                    | `<nixos-hardware/pcengines/apu>`                   |
 | [Raspberry Pi 2][]                | `<nixos-hardware/raspberry-pi/2>`                  |
 | [Samsung Series 9 NP900X3C][]     | `<nixos-hardware/samsung/np900x3c>`                |
@@ -164,6 +165,7 @@ See code for all available configurations.
 [Lenovo ThinkPad X13 Yoga]: lenovo/thinkpad/x13-yoga
 [Lenovo ThinkPad X260]: lenovo/thinkpad/x260
 [Microsoft Surface Pro 3]: microsoft/surface-pro/3
+[MSI GS60 2QE]: msi/gs60
 [Raspberry Pi 2]: raspberry-pi/2
 [Samsung Series 9 NP900X3C]: samsung/np900x3c
 [Purism Librem 13v3]: purism/librem/13v3
diff --git a/msi/gs60/default.nix b/msi/gs60/default.nix
new file mode 100644
index 0000000..bd1db27
--- /dev/null
+++ b/msi/gs60/default.nix
@@ -0,0 +1,29 @@
+{ config, pkgs, lib, ... }:
+{
+  imports = [
+    ../../common/cpu/intel
+    ../../common/pc/laptop
+  ];
+
+  boot = {
+
+    # Interferes with Fn- action keys
+    kernelParams = [ "video.report_key_events=0" ];
+
+    # Workaround for problematic firmware loading
+    extraModprobeConfig = ''
+      options ath10k_core skip_otp=y
+    '';
+
+  };
+
+  # Laptop can't correctly suspend if wlan is active
+  powerManagement = {
+    powerDownCommands = ''
+      ${pkgs.utillinux}/bin/rfkill block wlan
+    '';
+    resumeCommands = ''
+      ${pkgs.utillinux}/bin/rfkill unblock wlan
+    '';
+  };
+}