diff --git a/realmd.spec b/realmd.spec
index 950f897..0c8f2db 100644
--- a/realmd.spec
+++ b/realmd.spec
@@ -1,6 +1,6 @@
 Name:    realmd
 Version: 0.17.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: Kerberos realm enrollment service
 License: LGPLv2+
 URL:     https://gitlab.freedesktop.org/realmd/realmd
@@ -37,11 +37,15 @@ BuildRequires: krb5-devel
 BuildRequires: systemd-devel
 BuildRequires: libxslt
 BuildRequires: xmlto
+BuildRequires: samba-common-tools
 BuildRequires: python3
 
 Requires: authselect
 Requires: polkit
 Conflicts: realmd-devel-docs < %{version}-%{release}
+# This build will use Samba's new command line options so it cannot be used
+# with older versions of Samba.
+Conflicts:     samba-common-tools < 4.15
 
 %description
 realmd is a DBus system service which manages discovery and enrollment in realms
@@ -64,6 +68,7 @@ applications that use %{name}.
 %build
 autoreconf -fi
 %configure --disable-silent-rules \
+    --with-new-samba-cli-options=yes \
 %if 0%{?rhel}
     --with-vendor-error-message='Please check\n    https://red.ht/support_rhel_ad \nto get help for common issues.' \
 %endif
@@ -108,6 +113,10 @@ make install DESTDIR=%{buildroot}
 %doc ChangeLog
 
 %changelog
+* Tue Jan 11 2022 Sumit Bose <sbose@redhat.com> - 0.17.0-9
+- enforce new Samba command line options
+  Resolves: rhbz#2028530
+
 * Mon Jan 10 2022 Sumit Bose <sbose@redhat.com> - 0.17.0-8
 - LDAP socket timeout, fix duplicated logs and new Samba command line options
   Resolves: rhbz#2038260