diff --git a/.github/duplicates-upstream-extra.txt b/.github/duplicates-upstream-extra.txt
index 38cf21de9..c74b103da 100644
--- a/.github/duplicates-upstream-extra.txt
+++ b/.github/duplicates-upstream-extra.txt
@@ -1,4 +1,3 @@
-xenctrl
 ocaml
 ocaml-base-compiler
 ocaml-system
diff --git a/.github/duplicates-xs-toolstack.txt b/.github/duplicates-xs-toolstack.txt
index 38cf21de9..c74b103da 100644
--- a/.github/duplicates-xs-toolstack.txt
+++ b/.github/duplicates-xs-toolstack.txt
@@ -1,4 +1,3 @@
-xenctrl
 ocaml
 ocaml-base-compiler
 ocaml-system
diff --git a/packages/xs-extra-dummy/xs-toolstack.master/opam b/packages/xs-extra-dummy/xs-toolstack.master/opam
index 77ed5f9a6..e641c302f 100644
--- a/packages/xs-extra-dummy/xs-toolstack.master/opam
+++ b/packages/xs-extra-dummy/xs-toolstack.master/opam
@@ -56,7 +56,6 @@ depends: [
   "xen-api-client"
   "xen-api-client-async"
   "xen-api-sdk"
-  "xenctrl"
   "xml-light2"
   "zstd"
 ]
diff --git a/packages/xs/ezxenstore.0.4.2/opam b/packages/xs-extra/ezxenstore.master/opam
similarity index 81%
rename from packages/xs/ezxenstore.0.4.2/opam
rename to packages/xs-extra/ezxenstore.master/opam
index d5c7746fe..036f1c387 100644
--- a/packages/xs/ezxenstore.0.4.2/opam
+++ b/packages/xs-extra/ezxenstore.master/opam
@@ -23,7 +23,5 @@ An easy-to-use xenstore library with a simplified interface geared
 towards use within a daemon that maintains a single connection to
 xenstored."""
 url {
-  src:
-    "https://github.com/xapi-project/ezxenstore/archive/v0.4.2.tar.gz"
-  checksum: "sha256=709ba936f8b1a3c76e31c655752294287f215601b3238204688818676c6e7d97"
+  src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz"
 }
diff --git a/packages/xs-extra/xapi-xenopsd-xc.master/opam b/packages/xs-extra/xapi-xenopsd-xc.master/opam
index 1dbd62e5c..4cfbce452 100644
--- a/packages/xs-extra/xapi-xenopsd-xc.master/opam
+++ b/packages/xs-extra/xapi-xenopsd-xc.master/opam
@@ -45,7 +45,6 @@ depends: [
   "xenctrl"
   "xenstore"
   "xenstore_transport"
-  "xentoollog"
 ]
 synopsis:
   "A xenops plugin which knows how to use xenstore, xenctrl and xenguest to manage"
diff --git a/packages/xs-extra/xentoollog.master/opam b/packages/xs-extra/xentoollog.master/opam
deleted file mode 100644
index cb30127b8..000000000
--- a/packages/xs-extra/xentoollog.master/opam
+++ /dev/null
@@ -1,18 +0,0 @@
-opam-version: "2.0"
-synopsis: "Mock OCaml bindings for Xen's xentoollog"
-maintainer: "xen-api@lists.xen.org"
-authors: "Christian Lindig <christian.lindig@citrix.com>"
-license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
-homepage: "https://github.com/xapi-project/xenctrl"
-bug-reports: "https://github.com/xapi-project/xenctrl/issues"
-depends: [
-  "ocaml"
-  "dune" {>= "2.0"}
-  "base-unix"
-]
-build: ["dune" "build" "-p" name "-j" jobs]
-
-dev-repo: "git+https://github.com/xapi-project/xenctrl.git"
-url {
-  src: "https://github.com/xapi-project/xenctrl/archive/master.tar.gz"
-}
diff --git a/packages/xs/xenctrl.dummy/opam b/packages/xs/xenctrl.dummy/opam
deleted file mode 100644
index 21db2504a..000000000
--- a/packages/xs/xenctrl.dummy/opam
+++ /dev/null
@@ -1,18 +0,0 @@
-opam-version: "2.0"
-maintainer: "jonathan.ludlam@citrix.com"
-license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
-tags: [
-  "org:mirage"
-  "org:xapi-project"
-]
-build: [
-  ["rsync" "-avz" "/usr/lib64/ocaml/xenctrl/" "%{lib}%/xenctrl/"]
-  ["rsync" "-avz" "/usr/lib64/ocaml/xenmmap/" "%{lib}%/xenmmap/"]
-  ["rsync" "-avz" "/usr/lib64/ocaml/xeneventchn/" "%{lib}%/xeneventchn/"]
-]
-remove: [
-  ["ocamlfind" "remove" "xenctrl"]
-]
-depends: ["ocaml" "ocamlfind"]
-synopsis: "Dummy package to use the system xenctrl package"
-flags: light-uninstall
diff --git a/packages/xs/xenctrl.dummy/url.local b/packages/xs/xenctrl.dummy/url.local
deleted file mode 100644
index f9a7bce76..000000000
--- a/packages/xs/xenctrl.dummy/url.local
+++ /dev/null
@@ -1 +0,0 @@
-archive: "https://github.com/xapi-project/ocaml-xen-lowlevel-libs/archive/master/master.tar.gz"
diff --git a/tools/cleanup.sh b/tools/cleanup.sh
index dd7b90e53..34c314e36 100755
--- a/tools/cleanup.sh
+++ b/tools/cleanup.sh
@@ -12,6 +12,6 @@ set -euo pipefail
 opam admin check --ignore-test-doc
 # there is a conflict in ppxlib and sexplib0 version in with-test, ignore its tests for now
 RESOLVE=$(opam admin filter --verbose --dry-run --resolve=xs-toolstack | sed -n 2p | grep -v ppxlib)
-RESOLVE+=" upstream-extra-dummy xenctrl.dummy opam-depext opam-ed.0.3"
+RESOLVE+=" upstream-extra-dummy opam-depext opam-ed.0.3"
 RESOLVE+=" ocaml-base-compiler.${OCAML_VERSION_FULL} ocaml-system.${OCAML_VERSION_FULL}"
 exec opam admin filter --dry-run "--resolve=$(echo ${RESOLVE} | tr ' ' ',')" --or --with-test
diff --git a/tools/no-duplicates-check.bash b/tools/no-duplicates-check.bash
index ae4c1a252..382f1045e 100755
--- a/tools/no-duplicates-check.bash
+++ b/tools/no-duplicates-check.bash
@@ -16,11 +16,9 @@ function check_no_duplicates {
 }
 
 # makes sure no ordinary opam packages have more than a single version
-# the only exception is xenctrl.
 # This is required because of how the rpm distributions are built: they
 # try to install all versions of all ordinary packages, which fails because
 # the versions of a single package are never compatible.
-# xenctrl has 2 versions: dummy and master
 # several versions of the compiler might be wanted for testing:
 #   ocaml, ocaml-system, ocaml-base-compiler
 toolstack_packages=$(opam list --required-by "xs-toolstack" --recursive --short)