diff --git a/README.md b/README.md
index adc83e15..05f80eb4 100644
--- a/README.md
+++ b/README.md
@@ -184,6 +184,7 @@ See code for all available configurations.
 | [FriendlyARM NanoPi R5s](friendlyarm/nanopi-r5s)                                  | `<nixos-hardware/friendlyarm/nanopi-r5s>`               |
 | [Focus M2 Gen 1](focus/m2/gen1)                                                   | `<nixos-hardware/focus/m2/gen1>`                        |
 | [Gigabyte B550](gigabyte/b550)                                                    | `<nixos-hardware/gigabyte/b550>`                        |
+| [Gigabyte B650](gigabyte/b650)                                                    | `<nixos-hardware/gigabyte/b650>`                        |
 | [GPD MicroPC](gpd/micropc)                                                        | `<nixos-hardware/gpd/micropc>`                          |
 | [GPD P2 Max](gpd/p2-max)                                                          | `<nixos-hardware/gpd/p2-max>`                           |
 | [GPD Pocket 3](gpd/pocket-3)                                                      | `<nixos-hardware/gpd/pocket-3>`                         |
diff --git a/flake.nix b/flake.nix
index 08936002..b0ff9508 100644
--- a/flake.nix
+++ b/flake.nix
@@ -123,6 +123,7 @@
         friendlyarm-nanopi-r5s = import ./friendlyarm/nanopi-r5s;
         focus-m2-gen1 = import ./focus/m2/gen1;
         gigabyte-b550 = import ./gigabyte/b550;
+        gigabyte-b650 = import ./gigabyte/b650;
         google-pixelbook = import ./google/pixelbook;
         gpd-micropc = import ./gpd/micropc;
         gpd-p2-max = import ./gpd/p2-max;
diff --git a/gigabyte/b650/README.md b/gigabyte/b650/README.md
index aeb23cd9..94d20c3c 100644
--- a/gigabyte/b650/README.md
+++ b/gigabyte/b650/README.md
@@ -6,8 +6,3 @@ bug where the PC will wakeup immediately after going into suspend.
 ## Affects at least
 
 - Gigabyte B650M Aorus Elite AX (Rev. 1.3) (BIOS Version F32b)
-  - Can not be fixed by modifying enabled entries in /proc/acpi/wakeup.
-    Computer wakes up even if all enabled entries are disabled. Therefore, no
-    fix exist currently.
-
-
diff --git a/gigabyte/b650/b650-fix-suspend.nix b/gigabyte/b650/b650-fix-suspend.nix
new file mode 100644
index 00000000..b82bd33c
--- /dev/null
+++ b/gigabyte/b650/b650-fix-suspend.nix
@@ -0,0 +1,6 @@
+{
+  # see https://bbs.archlinux.org/viewtopic.php?pid=2227023
+  boot.kernelParams = [
+    "acpi_osi=\"!Windows 2015\""
+  ];
+}
diff --git a/gigabyte/b650/default.nix b/gigabyte/b650/default.nix
new file mode 100644
index 00000000..4b0a77af
--- /dev/null
+++ b/gigabyte/b650/default.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./b650-fix-suspend.nix
+  ];
+}