diff --git a/net-mgmt/realmd/Makefile b/net-mgmt/realmd/Makefile
index fe3872c85e3f..f293d975151f 100644
--- a/net-mgmt/realmd/Makefile
+++ b/net-mgmt/realmd/Makefile
@@ -1,49 +1,50 @@
 PORTNAME=	realmd
 PORTVERSION=	0.17.1
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	DBus service for configuring kerberos and other online identities
 WWW=		https://www.freedesktop.org/software/realmd/
 
 LICENSE=	LGPL21
 
 BUILD_DEPENDS=	gsed:textproc/gsed
 LIB_DEPENDS=	libpolkit-gobject-1.so:sysutils/polkit
 
 USES=		autoreconf gettext gmake gnome gssapi:mit,flags iconv ldap \
 		libtool localbase pathfix pkgconfig ssl tar:bz2
 USE_GNOME=	glib20
 
 USE_GITLAB=	yes
 GL_SITE=	https://gitlab.freedesktop.org
 GL_ACCOUNT=	realmd
 
 GNU_CONFIGURE=	yes
 TEST_TARGET=	check
 
 BINARY_ALIAS=   sed=${LOCALBASE}/bin/gsed
 
 OPTIONS_DEFINE=	DOCS
 
 CONFIGURE_ARGS=	${GSSAPI_CONFIGURE_ARGS} \
 		--with-distro=freebsd \
 		--without-systemd-journal \
 		--without-systemd-unit-dir
 CONFIGURE_ENV+=	KRB5_CONFIG=${KRB5CONFIG}
 
 DOCS_CONFIGURE_ENABLE=	doc
 DOCS_BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
 			xsltproc:textproc/libxslt \
 			xmlto:textproc/xmlto
 
 SUB_FILES=	realmd-freebsd.conf
 SUB_LIST=	SAMBA=samba${SAMBA_DEFAULT:S/.//}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/INSTALL_PROGRAM/INSTALL_DATA/g' ${WRKSRC}/service/Makefile.am
 
 pre-install:
 	@${INSTALL_DATA} ${WRKDIR}/realmd-freebsd.conf ${WRKSRC}/service/realmd-freebsd.conf
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/realmd/files/realmd-freebsd.conf.in b/net-mgmt/realmd/files/realmd-freebsd.conf.in
index 5e0644b9fe1c..bacd7f540268 100644
--- a/net-mgmt/realmd/files/realmd-freebsd.conf.in
+++ b/net-mgmt/realmd/files/realmd-freebsd.conf.in
@@ -1,61 +1,61 @@
 # Default values for realmd
 [service]
 debug = no
 automatic-install = yes
 
 [paths]
 net = %%LOCALBASE%%/bin/net
 winbindd = %%LOCALBASE%%/sbin/winbindd
 smb.conf = %%LOCALBASE%%/etc/smb4.conf
 sssd.conf = %%LOCALBASE%%/etc/sssd/sssd.conf
 adcli = %%LOCALBASE%%/sbin/adcli
 ipa-client-install = %%LOCALBASE%%/sbin/ipa-client-install
 pam_winbind.conf = %%LOCALBASE%%/etc/security/pam_winbind.conf
 krb5.conf = /etc/krb5.conf
 
 [active-directory]
 default-client = sssd
 os-name =
 os-version =
 
 [providers]
 sssd = yes
 samba = yes
 example = no
 
 [samba-packages]
 %%SAMBA%% = %%LOCALBASE%%/bin/net
 
 [winbind-packages]
 
 [sssd-packages]
 sssd2 = %%LOCALBASE%%/sbin/sssd
 
 [adcli-packages]
 adcli = %%LOCALBASE%%/sbin/adcli
 
 [commands]
 
 winbind-enable-logins =
 winbind-disable-logins =
 sssd-enable-logins =
 sssd-disable-logins =
 
 winbind-enable-service = /usr/sbin/sysrc winbindd_enable="YES"
 winbind-disable-service = /usr/sbin/sysrc winbindd_enable="NO"
 winbind-restart-service = /usr/sbin/service samba_server restart
 winbind-stop-service = /usr/sbin/service samba_server stop
 
 sssd-enable-service = /usr/sbin/service sssd enable
 sssd-disable-service = /usr/sbin/service sssd disable
 sssd-restart-service = /usr/sbin/service sssd restart
-sssd-stop-service = /usr/sbin/service sssd stop
-sssd-caches-flush = %%LOCALBASE%%/sbin/sss_cache --users --groups --netgroups --services --autofs-maps
+sssd-stop-service = /usr/sbin/service sssd onestop
+sssd-caches-flush = %%LOCALBASE%%/sbin/sss_cache --users --groups --netgroups --services
 
 [users]
 default-shell = /bin/sh
 default-home = /home/%U@%D
 
 [example.com]
 example-administrator = Administrator
 example-password = bureaucracy