diff -Nru rabbitmq-server-3.8.2/debian/changelog rabbitmq-server-3.8.2/debian/changelog
--- rabbitmq-server-3.8.2/debian/changelog	2021-06-23 13:05:38.000000000 +0000
+++ rabbitmq-server-3.8.2/debian/changelog	2022-12-29 20:11:23.000000000 +0000
@@ -1,3 +1,10 @@
+rabbitmq-server (3.8.2-0ubuntu1.4) UNRELEASED; urgency=medium
+
+  * Fix rabbitmqctl status when free disk space cannot be determined 
+    (LP: #1999816) 
+
+ -- Jorge Merlino <jorge.merlino@canonical.com>  Thu, 29 Dec 2022 20:11:23 +0000
+
 rabbitmq-server (3.8.2-0ubuntu1.3) focal-security; urgency=medium
 
   * SECURITY UPDATE: Denial of service
diff -Nru rabbitmq-server-3.8.2/debian/patches/fix_undefined.patch rabbitmq-server-3.8.2/debian/patches/fix_undefined.patch
--- rabbitmq-server-3.8.2/debian/patches/fix_undefined.patch	1970-01-01 00:00:00.000000000 +0000
+++ rabbitmq-server-3.8.2/debian/patches/fix_undefined.patch	2022-12-29 19:53:09.000000000 +0000
@@ -0,0 +1,32 @@
+Description: Fix rabbitmqctl status when the disk free space cannot be determined
+Author: Jorge Merlino <jorge.merlino@canonical.com>
+Origin: upstream
+Applied-Upstream: https://github.com/rabbitmq/rabbitmq-server/pull/4903
+Last-Update: 2022-12-29
+---
+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(:undefined, _) do
++    :undefined
++  end
++
+   def known_unit?(val) do
+     MapSet.member?(known_units(), String.downcase(val))
+   end
diff -Nru rabbitmq-server-3.8.2/debian/patches/series rabbitmq-server-3.8.2/debian/patches/series
--- rabbitmq-server-3.8.2/debian/patches/series	2021-06-23 13:05:30.000000000 +0000
+++ rabbitmq-server-3.8.2/debian/patches/series	2022-12-29 19:44:01.000000000 +0000
@@ -1,2 +1,3 @@
 lets-use-python3-not-python-binary.patch
 CVE-2021-22116.patch
+fix_undefined.patch