diff --git a/README.md b/README.md
index 2dab83c..825191a 100644
--- a/README.md
+++ b/README.md
@@ -95,6 +95,7 @@ See code for all available configurations.
 | [Dell XPS 15 9500][]              | `<nixos-hardware/dell/xps/15-9500>`                |
 | [Dell XPS 15 9500, nvidia][]      | `<nixos-hardware/dell/xps/15-9500/nvidia>`         |
 | [Google Pixelbook][]              | `<nixos-hardware/google/pixelbook>`                |
+| [GPD MicroPC][]                   | `<nixos-hardware/gpd/micropc>`                     |
 | [Inverse Path USB armory][]       | `<nixos-hardware/inversepath/usbarmory>`           |
 | Lenovo IdeaPad Z510               | `<nixos-hardware/lenovo/ideapad/z510>`             |
 | Lenovo ThinkPad E470              | `<nixos-hardware/lenovo/thinkpad/e470>`            |
@@ -164,6 +165,7 @@ See code for all available configurations.
 [Dell XPS 15 9560, intel only]: dell/xps/15-9560/intel
 [Dell XPS 15 9560, nvidia only]: dell/xps/15-9560/nvidia
 [Google Pixelbook]: google/pixelbook
+[GPD MicroPC]: gpd/micropc
 [Inverse Path USB armory]: inversepath/usbarmory
 [Lenovo ThinkPad X1 (6th Gen)]: lenovo/thinkpad/x1/6th-gen
 [Lenovo ThinkPad X1 (7th Gen)]: lenovo/thinkpad/x1/7th-gen
diff --git a/flake.nix b/flake.nix
index 570f0d2..3f55bcb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,6 +30,7 @@
       dell-xps-15-9500 = import ./dell/xps/15-9500;
       dell-xps-15-9500-nvidia = import ./dell/xps/15-9500/nvidia;
       google-pixelbook = import ./google/pixelbook;
+      gpd-micropc = import ./gpd/micropc;
       inversepath-usbarmory = import ./inversepath/usbarmory;
       lenovo-ideapad-z510 = import ./lenovo/ideapad/z510;
       lenovo-thinkpad-e470 = import ./lenovo/thinkpad/e470;
diff --git a/gpd/micropc/default.nix b/gpd/micropc/default.nix
new file mode 100644
index 0000000..d9a699e
--- /dev/null
+++ b/gpd/micropc/default.nix
@@ -0,0 +1,11 @@
+{ ... }:
+{
+  imports = [
+    ../../common/pc/laptop
+    ../../common/pc/laptop/ssd
+  ];
+
+  # Needed to have the keyboard working during the initrd sequence
+  boot.initrd.availableKernelModules = [ "battery" ];
+
+}