+diff -urp libvirt-4.5.0.orig/docs/auth.html libvirt-4.5.0/docs/auth.html
+--- libvirt-4.5.0.orig/docs/auth.html 2018-07-09 16:24:49.467875585 +0000
++++ libvirt-4.5.0/docs/auth.html 2018-07-09 16:25:07.306874521 +0000
+@@ -338,7 +338,7 @@ to turn on SASL auth in these listeners.
+ <p>
+ Since the libvirt SASL config file defaults to using GSSAPI (Kerberos), a
+ config change is rquired to enable plain password auth. This is done by
+-editting <code>/etc/sasl2/libvirt.conf</code> to set the <code>mech_list</code>
++editting <code>/etc/sasl/libvirt.conf</code> to set the <code>mech_list</code>
+ parameter to <code>scram-sha-1</code>.
+ </p>
+ <p>
+diff -urp libvirt-4.5.0.orig/docs/auth.html.in libvirt-4.5.0/docs/auth.html.in
+--- libvirt-4.5.0.orig/docs/auth.html.in 2018-07-09 16:24:49.471875584 +0000
++++ libvirt-4.5.0/docs/auth.html.in 2018-07-09 16:25:07.307874521 +0000
+@@ -267,7 +267,7 @@ to turn on SASL auth in these listeners.
+ <p>
+ Since the libvirt SASL config file defaults to using GSSAPI (Kerberos), a
+ config change is rquired to enable plain password auth. This is done by
+-editting <code>/etc/sasl2/libvirt.conf</code> to set the <code>mech_list</code>
++editting <code>/etc/sasl/libvirt.conf</code> to set the <code>mech_list</code>
+ parameter to <code>scram-sha-1</code>.
+ </p>
+ <p>
+diff -urp libvirt-4.5.0.orig/src/Makefile.in libvirt-4.5.0/src/Makefile.in
+--- libvirt-4.5.0.orig/src/Makefile.in 2018-07-09 16:24:49.542875580 +0000
++++ libvirt-4.5.0/src/Makefile.in 2018-07-09 16:25:07.311874521 +0000
+@@ -13166,13 +13166,13 @@ lxc/lxc_controller_dispatch.h: $(srcdir)
+ # This is needed for clients too, so can't wrap in
+ # the WITH_LIBVIRTD conditional
+ @WITH_SASL_TRUE@install-sasl:
+-@WITH_SASL_TRUE@ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl2/
++@WITH_SASL_TRUE@ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl/
+ @WITH_SASL_TRUE@ $(INSTALL_DATA) $(srcdir)/remote/libvirtd.sasl \
+-@WITH_SASL_TRUE@ $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
++@WITH_SASL_TRUE@ $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf
+
+ @WITH_SASL_TRUE@uninstall-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-sasl:
+ @WITH_SASL_FALSE@uninstall-sasl:
+
+diff -urp libvirt-4.5.0.orig/src/qemu/qemu.conf libvirt-4.5.0/src/qemu/qemu.conf
+--- libvirt-4.5.0.orig/src/qemu/qemu.conf 2018-07-09 16:24:49.520875581 +0000
++++ libvirt-4.5.0/src/qemu/qemu.conf 2018-07-09 16:25:07.311874521 +0000
+@@ -129,18 +129,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,
+@@ -205,17 +205,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"
+
+ # Enable use of TLS encryption on the chardev TCP transports.
+ #
+diff -urp libvirt-4.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-4.5.0/src/qemu/test_libvirtd_qemu.aug.in
+--- libvirt-4.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2018-07-09 16:24:49.520875581 +0000
++++ libvirt-4.5.0/src/qemu/test_libvirtd_qemu.aug.in 2018-07-09 16:25:07.312874521 +0000
+@@ -12,7 +12,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" }
+@@ -20,7 +20,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" }
+ { "chardev_tls" = "1" }
+ { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" }
+ { "chardev_tls_x509_verify" = "1" }
+diff -urp libvirt-4.5.0.orig/src/remote/libvirtd.conf libvirt-4.5.0/src/remote/libvirtd.conf
+--- libvirt-4.5.0.orig/src/remote/libvirtd.conf 2018-07-09 16:24:49.523875581 +0000
++++ libvirt-4.5.0/src/remote/libvirtd.conf 2018-07-09 16:25:07.312874521 +0000
+@@ -123,7 +123,7 @@