diff -urp libvirt-2.1.0.orig/daemon/libvirtd.conf libvirt-2.1.0/daemon/libvirtd.conf
--- libvirt-2.1.0.orig/daemon/libvirtd.conf	2016-08-20 10:07:32.043554000 +0000
+++ libvirt-2.1.0/daemon/libvirtd.conf	2016-08-20 10:07:47.074554000 +0000
@@ -123,7 +123,7 @@
 #          the network providing auth (eg, TLS/x509 certificates)
 #
 #  - sasl: use SASL infrastructure. The actual auth scheme is then
-#          controlled from /etc/sasl2/libvirt.conf. For the TCP
+#          controlled from /etc/sasl/libvirt.conf. For the TCP
 #          socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
 #          For non-TCP or TLS sockets, any scheme is allowed.
 #
@@ -154,7 +154,7 @@
 # If you don't enable SASL, then all TCP traffic is cleartext.
 # Don't do this outside of a dev/test scenario. For real world
 # use, always enable SASL and use the GSSAPI or DIGEST-MD5
-# mechanism in /etc/sasl2/libvirt.conf
+# mechanism in /etc/sasl/libvirt.conf
 #auth_tcp = "sasl"
 
 # Change the authentication scheme for TLS sockets.
diff -urp libvirt-2.1.0.orig/daemon/Makefile.am libvirt-2.1.0/daemon/Makefile.am
--- libvirt-2.1.0.orig/daemon/Makefile.am	2016-08-20 10:07:32.040554000 +0000
+++ libvirt-2.1.0/daemon/Makefile.am	2016-08-20 10:07:47.074554000 +0000
@@ -528,13 +528,13 @@ POD2MAN = pod2man -c "Virtualization Sup
 # the WITH_LIBVIRTD conditional
 if WITH_SASL
 install-data-sasl:
-	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl2/
+	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl/
 	$(INSTALL_DATA) $(srcdir)/libvirtd.sasl \
-		$(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
+		$(DESTDIR)$(sysconfdir)/sasl/libvirt.conf
 
 uninstall-data-sasl:
-	rm -f $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
-	rmdir $(DESTDIR)$(sysconfdir)/sasl2/ || :
+	rm -f $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf
+	rmdir $(DESTDIR)$(sysconfdir)/sasl/ || :
 else ! WITH_SASL
 install-data-sasl:
 uninstall-data-sasl:
diff -urp libvirt-2.1.0.orig/daemon/Makefile.in libvirt-2.1.0/daemon/Makefile.in
--- libvirt-2.1.0.orig/daemon/Makefile.in	2016-08-20 10:07:32.040554000 +0000
+++ libvirt-2.1.0/daemon/Makefile.in	2016-08-20 10:07:47.076554000 +0000
@@ -2842,13 +2842,13 @@ admin_dispatch.h: $(top_srcdir)/src/rpc/
 # This is needed for clients too, so can't wrap in
 # the WITH_LIBVIRTD conditional
 @WITH_SASL_TRUE@install-data-sasl:
-@WITH_SASL_TRUE@	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl2/
+@WITH_SASL_TRUE@	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl/
 @WITH_SASL_TRUE@	$(INSTALL_DATA) $(srcdir)/libvirtd.sasl \
-@WITH_SASL_TRUE@		$(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
+@WITH_SASL_TRUE@		$(DESTDIR)$(sysconfdir)/sasl/libvirt.conf
 
 @WITH_SASL_TRUE@uninstall-data-sasl:
-@WITH_SASL_TRUE@	rm -f $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
-@WITH_SASL_TRUE@	rmdir $(DESTDIR)$(sysconfdir)/sasl2/ || :
+@WITH_SASL_TRUE@	rm -f $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf
+@WITH_SASL_TRUE@	rmdir $(DESTDIR)$(sysconfdir)/sasl/ || :
 @WITH_SASL_FALSE@install-data-sasl:
 @WITH_SASL_FALSE@uninstall-data-sasl:
 
diff -urp libvirt-2.1.0.orig/docs/auth.html libvirt-2.1.0/docs/auth.html
--- libvirt-2.1.0.orig/docs/auth.html	2016-08-20 10:07:32.082554000 +0000
+++ libvirt-2.1.0/docs/auth.html	2016-08-20 10:07:47.076554000 +0000
@@ -415,7 +415,7 @@ again:
 The plain TCP socket of the libvirt daemon defaults to using SASL for authentication.
 The SASL mechanism configured by default is DIGEST-MD5, which provides a basic
 username+password style authentication. To enable Kerberos single-sign-on instead,
-the libvirt SASL configuration file must be changed. This is <code>/etc/sasl2/libvirt.conf</code>.
+the libvirt SASL configuration file must be changed. This is <code>/etc/sasl/libvirt.conf</code>.
 The <code>mech_list</code> parameter must first be changed to <code>gssapi</code>
 instead of the default <code>digest-md5</code>, and keytab should be set to
 <code>/etc/libvirt/krb5.tab</code> . If SASL is enabled on the UNIX
diff -urp libvirt-2.1.0.orig/docs/auth.html.in libvirt-2.1.0/docs/auth.html.in
--- libvirt-2.1.0.orig/docs/auth.html.in	2016-08-20 10:07:32.100554000 +0000
+++ libvirt-2.1.0/docs/auth.html.in	2016-08-20 10:07:47.077554000 +0000
@@ -246,7 +246,7 @@ again:
 The plain TCP socket of the libvirt daemon defaults to using SASL for authentication.
 The SASL mechanism configured by default is DIGEST-MD5, which provides a basic
 username+password style authentication. To enable Kerberos single-sign-on instead,
-the libvirt SASL configuration file must be changed. This is <code>/etc/sasl2/libvirt.conf</code>.
+the libvirt SASL configuration file must be changed. This is <code>/etc/sasl/libvirt.conf</code>.
 The <code>mech_list</code> parameter must first be changed to <code>gssapi</code>
 instead of the default <code>digest-md5</code>, and keytab should be set to
 <code>/etc/libvirt/krb5.tab</code> . If SASL is enabled on the UNIX
diff -urp libvirt-2.1.0.orig/libvirt.spec libvirt-2.1.0/libvirt.spec
--- libvirt-2.1.0.orig/libvirt.spec	2016-08-20 10:07:31.917554000 +0000
+++ libvirt-2.1.0/libvirt.spec	2016-08-20 10:08:58.351554000 +0000
@@ -1827,7 +1827,7 @@ exit 0
 %{_datadir}/libvirt/cpu_map.xml
 %{_datadir}/libvirt/libvirtLogo.png
 
-%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
+%config(noreplace) %{_sysconfdir}/sasl/libvirt.conf
 
 %files admin
 %{_mandir}/man1/virt-admin.1*
diff -urp libvirt-2.1.0.orig/libvirt.spec.in libvirt-2.1.0/libvirt.spec.in
--- libvirt-2.1.0.orig/libvirt.spec.in	2016-08-20 10:07:31.915554000 +0000
+++ libvirt-2.1.0/libvirt.spec.in	2016-08-20 10:09:09.031554000 +0000
@@ -1827,7 +1827,7 @@ exit 0
 %{_datadir}/libvirt/cpu_map.xml
 %{_datadir}/libvirt/libvirtLogo.png
 
-%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
+%config(noreplace) %{_sysconfdir}/sasl/libvirt.conf
 
 %files admin
 %{_mandir}/man1/virt-admin.1*
diff -urp libvirt-2.1.0.orig/src/qemu/qemu.conf libvirt-2.1.0/src/qemu/qemu.conf
--- libvirt-2.1.0.orig/src/qemu/qemu.conf	2016-08-20 10:07:31.997554000 +0000
+++ libvirt-2.1.0/src/qemu/qemu.conf	2016-08-20 10:07:47.087554000 +0000
@@ -74,18 +74,18 @@
 # Examples include vinagre, virt-viewer and virt-manager
 # itself. UltraVNC, RealVNC, TightVNC do not support this
 #
-# It is necessary to configure /etc/sasl2/qemu.conf to choose
+# It is necessary to configure /etc/sasl/qemu.conf to choose
 # the desired SASL plugin (eg, GSSPI for Kerberos)
 #
 #vnc_sasl = 1
 
 
-# The default SASL configuration file is located in /etc/sasl2/
+# The default SASL configuration file is located in /etc/sasl/
 # When running libvirtd unprivileged, it may be desirable to
 # override the configs in this location. Set this parameter to
 # point to the directory, and create a qemu.conf in that location
 #
-#vnc_sasl_dir = "/some/directory/sasl2"
+#vnc_sasl_dir = "/some/directory/sasl"
 
 
 # QEMU implements an extension for providing audio over a VNC connection,
@@ -154,17 +154,17 @@
 # Enable use of SASL encryption on the SPICE server. This requires
 # a SPICE client which supports the SASL protocol extension.
 #
-# It is necessary to configure /etc/sasl2/qemu.conf to choose
+# It is necessary to configure /etc/sasl/qemu.conf to choose
 # the desired SASL plugin (eg, GSSPI for Kerberos)
 #
 #spice_sasl = 1
 
-# The default SASL configuration file is located in /etc/sasl2/
+# The default SASL configuration file is located in /etc/sasl/
 # When running libvirtd unprivileged, it may be desirable to
 # override the configs in this location. Set this parameter to
 # point to the directory, and create a qemu.conf in that location
 #
-#spice_sasl_dir = "/some/directory/sasl2"
+#spice_sasl_dir = "/some/directory/sasl"
 
 
 # By default, if no graphical front end is configured, libvirt will disable
diff -urp libvirt-2.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-2.1.0/src/qemu/test_libvirtd_qemu.aug.in
--- libvirt-2.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in	2016-08-20 10:07:31.997554000 +0000
+++ libvirt-2.1.0/src/qemu/test_libvirtd_qemu.aug.in	2016-08-20 10:09:46.009554000 +0000
@@ -9,7 +9,7 @@ module Test_libvirtd_qemu =
 { "vnc_tls_x509_verify" = "1" }
 { "vnc_password" = "XYZ12345" }
 { "vnc_sasl" = "1" }
-{ "vnc_sasl_dir" = "/some/directory/sasl2" }
+{ "vnc_sasl_dir" = "/some/directory/sasl" }
 { "vnc_allow_host_audio" = "0" }
 { "spice_listen" = "0.0.0.0" }
 { "spice_tls" = "1" }
@@ -17,7 +17,7 @@ module Test_libvirtd_qemu =
 { "spice_auto_unix_socket" = "1" }
 { "spice_password" = "XYZ12345" }
 { "spice_sasl" = "1" }
-{ "spice_sasl_dir" = "/some/directory/sasl2" }
+{ "spice_sasl_dir" = "/some/directory/sasl" }
 { "nographics_allow_host_audio" = "1" }
 { "remote_display_port_min" = "5900" }
 { "remote_display_port_max" = "65535" }
diff -urp libvirt-2.1.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args libvirt-2.1.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args
--- libvirt-2.1.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args	2016-08-20 10:07:32.590554000 +0000
+++ libvirt-2.1.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args	2016-08-20 10:07:48.739554000 +0000
@@ -3,7 +3,7 @@ PATH=/bin \
 HOME=/home/test \
 USER=test \
 LOGNAME=test \
-SASL_CONF_PATH=/root/.sasl2 \
+SASL_CONF_PATH=/root/.sasl \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu \
 -name QEMUGuest1 \
diff -urp libvirt-2.1.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args libvirt-2.1.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args
--- libvirt-2.1.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args	2016-08-20 10:07:32.591554000 +0000
+++ libvirt-2.1.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args	2016-08-20 10:07:48.739554000 +0000
@@ -3,7 +3,7 @@ PATH=/bin \
 HOME=/home/test \
 USER=test \
 LOGNAME=test \
-SASL_CONF_PATH=/root/.sasl2 \
+SASL_CONF_PATH=/root/.sasl \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu \
 -name QEMUGuest1 \
diff -urp libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args libvirt-2.1.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args
--- libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args	2016-08-20 10:07:32.622554000 +0000
+++ libvirt-2.1.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args	2016-08-20 10:07:48.740554000 +0000
@@ -3,7 +3,7 @@ PATH=/bin \
 HOME=/home/test \
 USER=test \
 LOGNAME=test \
-SASL_CONF_PATH=/root/.sasl2 \
+SASL_CONF_PATH=/root/.sasl \
 QEMU_AUDIO_DRV=spice \
 /usr/bin/qemu \
 -name QEMUGuest1 \
diff -urp libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args libvirt-2.1.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args
--- libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args	2016-08-20 10:07:32.623554000 +0000
+++ libvirt-2.1.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args	2016-08-20 10:07:48.740554000 +0000
@@ -3,7 +3,7 @@ PATH=/bin \
 HOME=/home/test \
 USER=test \
 LOGNAME=test \
-SASL_CONF_PATH=/root/.sasl2 \
+SASL_CONF_PATH=/root/.sasl \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu \
 -name QEMUGuest1 \
diff -urp libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args libvirt-2.1.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args
--- libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args	2016-08-20 10:07:32.623554000 +0000
+++ libvirt-2.1.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args	2016-08-20 10:07:48.740554000 +0000
@@ -3,7 +3,7 @@ PATH=/bin \
 HOME=/home/test \
 USER=test \
 LOGNAME=test \
-SASL_CONF_PATH=/root/.sasl2 \
+SASL_CONF_PATH=/root/.sasl \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu \
 -name QEMUGuest1 \
diff -urp libvirt-2.1.0.orig/tests/qemuxml2argvtest.c libvirt-2.1.0/tests/qemuxml2argvtest.c
--- libvirt-2.1.0.orig/tests/qemuxml2argvtest.c	2016-08-20 10:07:32.132554000 +0000
+++ libvirt-2.1.0/tests/qemuxml2argvtest.c	2016-08-20 10:07:48.741554000 +0000
@@ -929,7 +929,7 @@ mymain(void)
 
     driver.config->vncSASL = 1;
     VIR_FREE(driver.config->vncSASLdir);
-    ignore_value(VIR_STRDUP(driver.config->vncSASLdir, "/root/.sasl2"));
+    ignore_value(VIR_STRDUP(driver.config->vncSASLdir, "/root/.sasl"));
     DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC);
     driver.config->vncTLS = 1;
     driver.config->vncTLSx509verify = 1;
@@ -953,7 +953,7 @@ mymain(void)
     DO_TEST("graphics-spice-no-args",
             QEMU_CAPS_SPICE);
     driver.config->spiceSASL = 1;
-    ignore_value(VIR_STRDUP(driver.config->spiceSASLdir, "/root/.sasl2"));
+    ignore_value(VIR_STRDUP(driver.config->spiceSASLdir, "/root/.sasl"));
     DO_TEST("graphics-spice-sasl",
             QEMU_CAPS_VGA_QXL,
             QEMU_CAPS_SPICE,
diff -urp libvirt-2.1.0.orig/tests/virconfdata/libvirtd.conf libvirt-2.1.0/tests/virconfdata/libvirtd.conf
--- libvirt-2.1.0.orig/tests/virconfdata/libvirtd.conf	2016-08-20 10:07:33.070554000 +0000
+++ libvirt-2.1.0/tests/virconfdata/libvirtd.conf	2016-08-20 10:09:58.088554000 +0000
@@ -108,7 +108,7 @@ unix_sock_admin_perms = "0700"
 #          the network providing auth (eg, TLS/x509 certificates)
 #
 #  - sasl: use SASL infrastructure. The actual auth scheme is then
-#          controlled from /etc/sasl2/libvirt.conf. For the TCP
+#          controlled from /etc/sasl/libvirt.conf. For the TCP
 #          socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
 #          For non-TCP or TLS sockets,  any scheme is allowed.
 #
@@ -139,7 +139,7 @@ auth_unix_rw = "none"
 # If you don't enable SASL, then all TCP traffic is cleartext.
 # Don't do this outside of a dev/test scenario. For real world
 # use, always enable SASL and use the GSSAPI or DIGEST-MD5
-# mechanism in /etc/sasl2/libvirt.conf
+# mechanism in /etc/sasl/libvirt.conf
 auth_tcp = "sasl"
 
 # Change the authentication scheme for TLS sockets.
diff -urp libvirt-2.1.0.orig/tests/virconfdata/libvirtd.out libvirt-2.1.0/tests/virconfdata/libvirtd.out
--- libvirt-2.1.0.orig/tests/virconfdata/libvirtd.out	2016-08-20 10:07:33.070554000 +0000
+++ libvirt-2.1.0/tests/virconfdata/libvirtd.out	2016-08-20 10:10:07.948554000 +0000
@@ -87,7 +87,7 @@ unix_sock_admin_perms = "0700"
 #          the network providing auth (eg, TLS/x509 certificates)
 #
 #  - sasl: use SASL infrastructure. The actual auth scheme is then
-#          controlled from /etc/sasl2/libvirt.conf. For the TCP
+#          controlled from /etc/sasl/libvirt.conf. For the TCP
 #          socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
 #          For non-TCP or TLS sockets,  any scheme is allowed.
 #
@@ -116,7 +116,7 @@ auth_unix_rw = "none"
 # If you don't enable SASL, then all TCP traffic is cleartext.
 # Don't do this outside of a dev/test scenario. For real world
 # use, always enable SASL and use the GSSAPI or DIGEST-MD5
-# mechanism in /etc/sasl2/libvirt.conf
+# mechanism in /etc/sasl/libvirt.conf
 auth_tcp = "sasl"
 # Change the authentication scheme for TLS sockets.
 #