diff -Nru rabbitmq-server-3.9.13/debian/changelog rabbitmq-server-3.9.13/debian/changelog
--- rabbitmq-server-3.9.13/debian/changelog	2022-02-23 05:12:34.000000000 -0300
+++ rabbitmq-server-3.9.13/debian/changelog	2023-01-30 18:59:07.000000000 -0300
@@ -1,3 +1,11 @@
+rabbitmq-server (3.9.13-1ubuntu0.22.10) kinetic; urgency=medium
+
+  * debian/patches/lp1999816-fix-rabbitmqctl-status-disk-free-timeout.patch:
+    Fix rabbitmqctl status when free disk space cannot be determined
+    (LP: #1999816) 
+
+ -- Jorge Merlino <jorge.merlino@canonical.com>  Mon, 30 Jan 2023 18:59:07 -0300
+
 rabbitmq-server (3.9.13-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru rabbitmq-server-3.9.13/debian/control rabbitmq-server-3.9.13/debian/control
--- rabbitmq-server-3.9.13/debian/control	2022-02-23 05:12:34.000000000 -0300
+++ rabbitmq-server-3.9.13/debian/control	2023-01-30 18:59:07.000000000 -0300
@@ -1,7 +1,8 @@
 Source: rabbitmq-server
 Section: net
 Priority: optional
-Maintainer: Debian OpenStack <team+openstack@tracker.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian OpenStack <team+openstack@tracker.debian.org>
 Uploaders:
  James Page <james.page@ubuntu.com>,
  Thomas Goirand <zigo@debian.org>,
diff -Nru rabbitmq-server-3.9.13/debian/patches/lp1999816-fix-rabbitmqctl-status-disk-free-timeout.patch rabbitmq-server-3.9.13/debian/patches/lp1999816-fix-rabbitmqctl-status-disk-free-timeout.patch
--- rabbitmq-server-3.9.13/debian/patches/lp1999816-fix-rabbitmqctl-status-disk-free-timeout.patch	1969-12-31 21:00:00.000000000 -0300
+++ rabbitmq-server-3.9.13/debian/patches/lp1999816-fix-rabbitmqctl-status-disk-free-timeout.patch	2023-01-30 18:59:07.000000000 -0300
@@ -0,0 +1,37 @@
+From: Philip Kuryloski <kuryloskip@vmware.com>
+Subject: Fix `rabbitmqctl status` when the disk_free cannot be
+ determined
+
+By adjusting RabbitMQ.CLI.InformationUnit to no longer attempt to
+convert non-numeric values
+
+Origin: upstream, https://github.com/rabbitmq/rabbitmq-server/pull/4897
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1999816
+Last-Update: 2023-01-30
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/information_unit.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/information_unit.ex
+index c5e02277a9e..fa548c8fe18 100644
+--- a/deps/rabbitmq_cli/lib/rabbitmq/cli/information_unit.ex
++++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/information_unit.ex
+@@ -30,14 +30,18 @@ defmodule RabbitMQ.CLI.InformationUnit do
+     :rabbit_resource_monitor_misc.parse_information_unit(val)
+   end
+ 
+-  def convert(bytes, "bytes") do
++  def convert(bytes, "bytes") when is_number(bytes) do
+     bytes
+   end
+ 
+-  def convert(bytes, unit) do
++  def convert(bytes, unit) when is_number(bytes) do
+     do_convert(bytes, String.downcase(unit))
+   end
+ 
++  def convert(:unknown, _) do
++    :unknown
++  end
++
+   def known_unit?(val) do
+     MapSet.member?(known_units(), String.downcase(val))
+   end
diff -Nru rabbitmq-server-3.9.13/debian/patches/series rabbitmq-server-3.9.13/debian/patches/series
--- rabbitmq-server-3.9.13/debian/patches/series	2022-02-23 05:12:34.000000000 -0300
+++ rabbitmq-server-3.9.13/debian/patches/series	2023-01-30 18:55:24.000000000 -0300
@@ -1,2 +1,3 @@
 lets-use-python3-not-python-binary.patch
 rabbitmq-dist.mk.patch
+lp1999816-fix-rabbitmqctl-status-disk-free-timeout.patch