diff --git a/.gitmodules b/.gitmodules
index 2efb7fc06823a0f3277ad9e87fdec98b1e74c06a..3fb1c5b1c902a6664e42a8cdd14c69a4bc0a4047 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,6 @@
 [submodule "libs/devlib"]
 	path = libs/devlib
-	url = https://github.com/derkling/devlib.git
-	branch = devlib-next
+	url = https://github.com/ARM-Software/devlib.git
 [submodule "libs/trappy"]
 	path = libs/trappy
 	url = https://github.com/ARM-Software/trappy.git
diff --git a/libs/devlib b/libs/devlib
index 95aaa2662e8e7a6639b7aa273acec7d90971976d..91f4f97a0b44ab76da0c0214cb86815f969ab465 160000
--- a/libs/devlib
+++ b/libs/devlib
@@ -1 +1 @@
-Subproject commit 95aaa2662e8e7a6639b7aa273acec7d90971976d
+Subproject commit 91f4f97a0b44ab76da0c0214cb86815f969ab465