diff --git a/bin/xt-guess-suite-and-mirror b/bin/xt-guess-suite-and-mirror
index 2e961c9..d22f9db 100755
--- a/bin/xt-guess-suite-and-mirror
+++ b/bin/xt-guess-suite-and-mirror
@@ -143,7 +143,7 @@ all_sources_list_files: foreach my $sources_list_file (@sources_list_files) {
             # Skip updates, backports, volatile or security mirror.
             next if $source_components[2] !~ /^[a-z]+$/;
 
-            if ($source_components[1] =~ m(/debian/?$|/ubuntu/?$)) {
+            if ($source_components[1] =~ m(/debian/?$|/ubuntu(-ports)?/?$)) {
                 # Seems a typical mirror. Let's use that one
 
                 $mirror = $source_components[1];
diff --git a/debian/changelog b/debian/changelog
index 034f51c..24be3a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ xen-tools (4.9.2-1) UNRELEASED; urgency=medium
     + xt-guess-suite-and-mirror:
       - Bump default ubuntu fallback release to 22.04 Jammy LTS.
       - Add new option --sources-list to pass a file to parse.
+      - Add support for Ubuntu Ports APT repos. (Closes: #1023667,
+        LP: #1995969)
   * Update upstream signing key to update its expiry date.
   * Depend and Build-Depend on non-(build-)essential package
     mount. (Closes: #1027383)