diff --git a/SOURCES/0001-service-use-kerberos-method-secrets-and-keytab.patch b/SOURCES/0001-service-use-kerberos-method-secrets-and-keytab.patch
new file mode 100644
index 0000000..69674e4
--- /dev/null
+++ b/SOURCES/0001-service-use-kerberos-method-secrets-and-keytab.patch
@@ -0,0 +1,30 @@
+From 517fa766782421302da827278ca17e6b2ad57da3 Mon Sep 17 00:00:00 2001
+From: Sumit Bose <sbose@redhat.com>
+Date: Fri, 21 Feb 2020 14:06:16 +0100
+Subject: [PATCH] service: use "kerberos method" "secrets and keytab"
+
+When using Samba with Winbind the host password stored in secrets.tdb is
+still important so the "secrets and keytab" should be the preferred
+"kerberos method".
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1801195
+---
+ service/realm-samba.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/service/realm-samba.c b/service/realm-samba.c
+index e2a3608..4940b38 100644
+--- a/service/realm-samba.c
++++ b/service/realm-samba.c
+@@ -200,7 +200,7 @@ on_join_do_winbind (GObject *source,
+ 		                         "template shell", realm_settings_string ("users", "default-shell"),
+ 		                         "netbios name", computer_name,
+ 		                         "password server", enroll->disco->explicit_server,
+-		                         "kerberos method", "system keytab",
++		                         "kerberos method", "secrets and keytab",
+ 		                         NULL);
+ 	}
+ 
+-- 
+2.24.1
+
diff --git a/SPECS/realmd.spec b/SPECS/realmd.spec
index c2070d2..b1c6cf7 100644
--- a/SPECS/realmd.spec
+++ b/SPECS/realmd.spec
@@ -1,6 +1,6 @@
 Name:		realmd
 Version:	0.16.3
-Release:	17%{?dist}
+Release:	18%{?dist}
 Summary:	Kerberos realm enrollment service
 License:	LGPLv2+
 URL:		http://cgit.freedesktop.org/realmd/realmd/
@@ -37,6 +37,9 @@ Patch19:	0002-doc-add-see-also-to-man-pages.patch
 # rhbz#1747456 - Document realmd.conf and how realmd reads the configuration
 Patch20:	0001-doc-extend-description-of-config-handling.patch
 
+# rhbz#1801195
+Patch21:	0001-service-use-kerberos-method-secrets-and-keytab.patch
+
 BuildRequires:	gcc
 BuildRequires:	automake
 BuildRequires:	autoconf
@@ -104,6 +107,10 @@ make install DESTDIR=%{buildroot}
 %doc ChangeLog
 
 %changelog
+* Fri Feb 21 2020 Sumit Bose <sbose@redhat.com> - 0.16.3-18
+- Fix kerberos method
+  Resolves: rhbz#1801195
+
 * Sun Dec 01 2019 Sumit Bose <sbose@redhat.com> - 0.16.3-17
 - rebuild fails if DISTRO variable is exported
   Resolves: rhbz#1747454