diff -urN dnsmasq-2.47/dnsmasq.conf.example.orig dnsmasq-2.47/dnsmasq.conf.example
--- dnsmasq-2.47/dnsmasq.conf.example.orig	2009-01-03 14:28:51.000000000 -0600
+++ dnsmasq-2.47/dnsmasq.conf.example	2009-05-29 08:34:56.000000000 -0500
@@ -381,7 +381,7 @@
 # The DHCP server needs somewhere on disk to keep its lease database.
 # This defaults to a sane location, but if you want to change it, use
 # the line below.
-#dhcp-leasefile=/var/lib/misc/dnsmasq.leases
+#dhcp-leasefile=/var/lib/dnsmasq/dnsmasq.leases
 
 # Set the DHCP server to authoritative mode. In this mode it will barge in
 # and take over the lease for any client which broadcasts on the network,
diff -urN dnsmasq-2.47/man/dnsmasq.8.orig dnsmasq-2.47/man/dnsmasq.8
--- dnsmasq-2.47/man/dnsmasq.8.orig	2009-01-28 04:31:53.000000000 -0600
+++ dnsmasq-2.47/man/dnsmasq.8	2009-05-29 08:34:56.000000000 -0500
@@ -1189,7 +1189,7 @@
 
 .IR /etc/ethers
 
-.IR /var/lib/misc/dnsmasq.leases 
+.IR /var/lib/dnsmasq/dnsmasq.leases 
 
 .IR /var/db/dnsmasq.leases
 
diff -urN dnsmasq-2.47/man/es/dnsmasq.8.orig dnsmasq-2.47/man/es/dnsmasq.8
--- dnsmasq-2.47/man/es/dnsmasq.8.orig	2008-11-17 05:48:33.000000000 -0600
+++ dnsmasq-2.47/man/es/dnsmasq.8	2009-05-29 08:34:56.000000000 -0500
@@ -1222,7 +1222,7 @@
 
 .IR /etc/ethers
 
-.IR /var/lib/misc/dnsmasq.leases 
+.IR /var/lib/dnsmasq/dnsmasq.leases 
 
 .IR /var/db/dnsmasq.leases
 
diff -urN dnsmasq-2.47/src/config.h.orig dnsmasq-2.47/src/config.h
--- dnsmasq-2.47/src/config.h.orig	2009-02-05 06:14:24.000000000 -0600
+++ dnsmasq-2.47/src/config.h	2009-05-29 08:34:45.000000000 -0500
@@ -45,7 +45,7 @@
 #   elif defined(__sun__) || defined (__sun)
 #      define LEASEFILE "/var/cache/dnsmasq.leases"
 #   else
-#      define LEASEFILE "/var/lib/misc/dnsmasq.leases"
+#      define LEASEFILE "/var/lib/dnsmasq/dnsmasq.leases"
 #   endif
 #endif
 
@@ -167,7 +167,7 @@
 /* platform independent options- uncomment to enable */
 #define HAVE_TFTP
 /* #define HAVE_BROKEN_RTC */
-/* #define HAVE_DBUS */
+#define HAVE_DBUS
 
 /* Allow TFTP to be disabled with COPTS=-DNO_TFTP */
 #ifdef NO_TFTP