diff -Nru samba-4.15.5~dfsg/debian/changelog samba-4.15.5~dfsg/debian/changelog
--- samba-4.15.5~dfsg/debian/changelog	2022-03-25 17:53:19.000000000 +0000
+++ samba-4.15.5~dfsg/debian/changelog	2022-03-09 20:31:25.000000000 +0000
@@ -1,3 +1,13 @@
+samba (2:4.15.5~dfsg-0ubuntu5) jammy; urgency=medium
+
+  * Enable glusterfs support (LP: #1894618):
+    - d/control: revert disabling of glusterfs, since it's in main now
+    - d/rules: in Ubuntu, glusterfs is not built for i386, so don't
+      enable the samba glusterfs vfs mofule in that case
+    - d/control: build-depend on libglusterfs-dev only on !i386 arches
+
+ -- Andreas Hasenack <andreas@canonical.com>  Wed, 09 Mar 2022 17:31:25 -0300
+
 samba (2:4.15.5~dfsg-0ubuntu4) jammy; urgency=medium
 
   * Build dlz module for bind 9.18.x (LP: #1964032)
diff -Nru samba-4.15.5~dfsg/debian/control samba-4.15.5~dfsg/debian/control
--- samba-4.15.5~dfsg/debian/control	2022-03-25 17:45:48.000000000 +0000
+++ samba-4.15.5~dfsg/debian/control	2022-03-09 20:31:25.000000000 +0000
@@ -28,6 +28,7 @@
                libcups2-dev,
                libdbus-1-dev,
                libgnutls28-dev (>= 3.6.5),
+               libglusterfs-dev [!i386],
                libgpgme11-dev,
                libicu-dev,
                libjansson-dev,
@@ -289,7 +290,7 @@
 Breaks: samba (<< 2:4.3.2+dfsg-1), samba-libs (<< 2:4.3.2+dfsg-1)
 Replaces: samba (<< 2:4.3.2+dfsg-1), samba-libs (<< 2:4.3.2+dfsg-1)
 Depends: samba-libs (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Recommends: ${vfsceph:Recommends}, ${vfssnapper:Recommends}
+Recommends: ${vfsceph:Recommends}, ${vfsglusterfs:Recommends}, ${vfssnapper:Recommends}
 Enhances: samba
 Description: Samba Virtual FileSystem plugins
  Samba is an implementation of the SMB/CIFS protocol for Unix systems,
@@ -306,8 +307,8 @@
   * vfs_shadow_copy2: Expose snapshots to Windows clients as shadow copies
   * vfs_worm: Disallow writes for older file
  .
- Note: The runtime dependencies of vfs_ceph and vfs_snapper are moved to
- Recommends.
+ Note: The runtime dependencies of vfs_ceph, vfs_glusterfs and vfs_snapper are
+ moved to Recommends.
 
 Package: libsmbclient
 Section: libs
diff -Nru samba-4.15.5~dfsg/debian/rules samba-4.15.5~dfsg/debian/rules
--- samba-4.15.5~dfsg/debian/rules	2022-03-25 17:46:34.000000000 +0000
+++ samba-4.15.5~dfsg/debian/rules	2022-03-09 20:31:25.000000000 +0000
@@ -98,8 +98,8 @@
 ifneq ($(DEB_HOST_ARCH_OS), linux)
     WITH_CEPH = no
 endif
-# GlusterFS is not in Ubuntu main
-ifeq ($(DEB_VENDOR), Ubuntu)
+# GlusterFS is not built for i386 on Ubuntu
+ifeq ($(DEB_VENDOR) $(DEB_HOST_ARCH), Ubuntu i386)
     WITH_GLUSTERFS = no
 endif