diff --git a/.gitmodules b/.gitmodules
index c98e03b..91c0cce 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,15 +1,15 @@
 [submodule "xennet"]
 	path = xennet
-	url = https://xenbits.xen.org/git-http/pvdrivers/win/xennet.git
+	url = https://github.com/marmarek/win-xennet
 [submodule "xenvbd"]
 	path = xenvbd
-	url = https://xenbits.xen.org/git-http/pvdrivers/win/xenvbd.git
+	url = https://github.com/marmarek/win-xenvbd
 [submodule "xenvif"]
 	path = xenvif
 	url = https://xenbits.xen.org/git-http/pvdrivers/win/xenvif.git
 [submodule "xenbus"]
 	path = xenbus
-	url = https://xenbits.xen.org/git-http/pvdrivers/win/xenbus.git
+	url = https://github.com/xcp-ng/win-xenbus
 [submodule "xeniface"]
 	path = xeniface
 	url = https://xenbits.xen.org/git-http/pvdrivers/win/xeniface.git
diff --git a/0001-Remove-old-revisions.patch b/0001-Remove-old-revisions.patch
new file mode 100644
index 0000000..3bfeee3
--- /dev/null
+++ b/0001-Remove-old-revisions.patch
@@ -0,0 +1,37 @@
+From 152a7a5de10980c75b3ca8e3788144166259cadd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
+ <marmarek@invisiblethingslab.com>
+Date: Sun, 27 Jul 2025 03:57:20 +0200
+Subject: [PATCH] Remove old revisions
+
+With revision 0x0900000C it a limit of REGSTR_VAL_MAX_HCID_LEN. Remove
+old revisions to fix the issue for now. It will break updating from
+older versions, but it isn't relevant for now.
+---
+ include/revision.h | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/include/revision.h b/include/revision.h
+index ec35aeb..2f45548 100644
+--- a/xenbus/include/revision.h
++++ b/xenbus/include/revision.h
+@@ -48,16 +48,6 @@
+ 
+ //                    REVISION   S  SI   E   D  ST   R   C   G   U  CO  EM
+ #define DEFINE_REVISION_TABLE                                                \
+-    DEFINE_REVISION(0x09000000,  1,  2,  5,  1,  2,  1,  1,  2,  1,  0,  1), \
+-    DEFINE_REVISION(0x09000001,  1,  2,  6,  1,  2,  1,  1,  2,  1,  1,  1), \
+-    DEFINE_REVISION(0x09000002,  1,  2,  7,  1,  2,  1,  1,  2,  1,  1,  1), \
+-    DEFINE_REVISION(0x09000003,  1,  2,  8,  1,  2,  1,  1,  2,  1,  1,  1), \
+-    DEFINE_REVISION(0x09000004,  1,  2,  8,  1,  2,  1,  1,  3,  1,  1,  1), \
+-    DEFINE_REVISION(0x09000005,  1,  2,  8,  1,  2,  1,  2,  4,  1,  1,  1), \
+-    DEFINE_REVISION(0x09000006,  1,  3,  8,  1,  2,  1,  2,  4,  1,  1,  1), \
+-    DEFINE_REVISION(0x09000007,  1,  3,  8,  1,  2,  1,  2,  4,  1,  1,  2), \
+-    DEFINE_REVISION(0x09000008,  1,  3,  9,  1,  2,  1,  2,  4,  1,  1,  2), \
+-    DEFINE_REVISION(0x09000009,  1,  4,  9,  1,  2,  1,  2,  4,  1,  1,  2), \
+     DEFINE_REVISION(0x0900000A,  1,  4,  9,  1,  2,  1,  2,  4,  2,  1,  2), \
+     DEFINE_REVISION(0x0900000B,  1,  4,  9,  1,  2,  1,  2,  4,  3,  1,  2), \
+     DEFINE_REVISION(0x0900000C,  1,  4,  9,  1,  2,  1,  2,  4,  3,  1,  3)
+-- 
+2.49.0
+
diff --git a/0002-Always-enable-FORCE_ACTIVATE.patch b/0002-Always-enable-FORCE_ACTIVATE.patch
new file mode 100644
index 0000000..0a73247
--- /dev/null
+++ b/0002-Always-enable-FORCE_ACTIVATE.patch
@@ -0,0 +1,26 @@
+From c6e6e8c135957c1746ed4cb128176e6c43cfc403 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
+ <marmarek@invisiblethingslab.com>
+Date: Thu, 31 Jul 2025 03:48:57 +0200
+Subject: [PATCH] Always enable FORCE_ACTIVATE
+
+---
+ scripts/genfiles.ps1 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/genfiles.ps1 b/scripts/genfiles.ps1
+index 5b99728..11534c4 100644
+--- a/xenbus/scripts/genfiles.ps1
++++ b/xenbus/scripts/genfiles.ps1
+@@ -68,7 +68,7 @@ $Replacements = [ordered]@{
+ 	'MICRO_VERSION' = $Env:MICRO_VERSION;
+ 	'BUILD_NUMBER' = $Env:BUILD_NUMBER;
+ 
+-	'FORCE_ACTIVATE' = $Env:FORCE_ACTIVATE;
++	'FORCE_ACTIVATE' = "1";
+ 
+ 	# generated values
+ 	'GIT_REVISION' = $GitRevision;
+-- 
+2.49.0
+
diff --git a/vs2022/pvdrivers/pvdrivers.vcxproj b/vs2022/pvdrivers/pvdrivers.vcxproj
index f2df6fc..7957728 100644
--- a/vs2022/pvdrivers/pvdrivers.vcxproj
+++ b/vs2022/pvdrivers/pvdrivers.vcxproj
@@ -70,6 +70,8 @@
 set PV_CFG=free
 if "$(Configuration)" == "Debug" set PV_CFG=checked
 
+for %%p in ($(ProjectDir)\..\..\*.patch) do (git -C $(ProjectDir)\..\.. apply %%p)
+
 for %%d in (xenbus xeniface xenvbd xenvif xennet) do (
   cd $(ProjectDir)\..\..\%%d
   mkdir %%d\x64
@@ -110,6 +112,8 @@ for %%d in (xenbus xeniface xenvbd xenvif xennet) do (
 set PV_CFG=free
 if "$(Configuration)" == "Debug" set PV_CFG=checked
 
+for %%p in ($(ProjectDir)\..\..\*.patch) do (git -C $(ProjectDir)\..\.. apply %%p)
+
 for %%d in (xenbus xeniface xenvbd xenvif xennet) do (
   cd $(ProjectDir)\..\..\%%d
   mkdir %%d\x64
diff --git a/xenbus b/xenbus
index e76d03e..535c2c4 160000
--- a/xenbus
+++ b/xenbus
@@ -1 +1 @@
-Subproject commit e76d03e37550a0889c08be8e2a2caaf299d588c8
+Subproject commit 535c2c49ebea996706bebb8478523a50ca823518
diff --git a/xeniface b/xeniface
index 9cd9a60..a854af9 160000
--- a/xeniface
+++ b/xeniface
@@ -1 +1 @@
-Subproject commit 9cd9a604191bf26da18b564d1686e4ee0ccf3d32
+Subproject commit a854af9e2686f100764a7027137e954e481750b1
diff --git a/xennet b/xennet
index ad7717f..33b2650 160000
--- a/xennet
+++ b/xennet
@@ -1 +1 @@
-Subproject commit ad7717f6390b320255680ef3d4c86d4c6833e009
+Subproject commit 33b2650052428df663a6e96f82cdbcbb664c1059
diff --git a/xenvbd b/xenvbd
index 054c2e5..c86bc27 160000
--- a/xenvbd
+++ b/xenvbd
@@ -1 +1 @@
-Subproject commit 054c2e534d0151c7a4ac54adb295b3c7b1d096b5
+Subproject commit c86bc2780f9e34eaf14b25315d12e0340a18912c
diff --git a/xenvif b/xenvif
index 9fd1afe..4608bc1 160000
--- a/xenvif
+++ b/xenvif
@@ -1 +1 @@
-Subproject commit 9fd1afe4382b15ed8e063a816a328c0a580f038e
+Subproject commit 4608bc1b3a120af7314c06949de340cc60319f13