diff --git a/.cvsignore b/.cvsignore
index a90d914..108ce3b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-dnsmasq-2.51.tar.lzma
+dnsmasq-2.52.tar.lzma
diff --git a/dnsmasq.init b/dnsmasq.init
index 4a9822b..81364f7 100644
--- a/dnsmasq.init
+++ b/dnsmasq.init
@@ -24,6 +24,10 @@ if [ ! -z "${DOMAIN_SUFFIX}" ]; then
   OPTIONS="-s $DOMAIN_SUFFIX"
 fi
 
+pidfile=${PIDFILE-/var/run/dnsmasq.pid}
+lockfile=${LOCKFILE-/var/lock/subsys/dnsmasq}
+
+
 RETVAL=0
 
 # See how we were called.
@@ -33,16 +37,14 @@ case "$1" in
         daemon $dnsmasq $OPTIONS
 	RETVAL=$?
         echo
-        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/dnsmasq
+        [ $RETVAL -eq 0 ] && touch ${lockfile}
         ;;
   stop)
-        if test "x`pidof dnsmasq`" != x; then
-            echo -n "Shutting down dnsmasq: "
-            killproc dnsmasq
-        fi
+        echo -n "Shutting down dnsmasq: "
+        killproc -p ${pidfile} ${dnsmasq}
 	RETVAL=$?
         echo
-        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/dnsmasq /var/run/dnsmasq.pid
+        [ $RETVAL -eq 0 ] && rm -f ${lockfile} ${pidfile}
         ;;
   status)
 	status dnsmasq
@@ -50,7 +52,7 @@ case "$1" in
 	;;
   reload)
 	echo -n "Reloading dnsmasq: "
-	killproc dnsmasq -HUP
+	killproc -p ${pidfile} ${dnsmasq} -HUP
 	RETVAL=$?
 	echo
 	;;
@@ -60,7 +62,7 @@ case "$1" in
 	RETVAL=$?
 	;;
   condrestart)
-	    if test "x`/sbin/pidof dnsmasq`" != x; then
+	    if test "x`pidfileofproc dnsmasq`" != x; then
 		$0 stop
 		$0 start
 		RETVAL=$?
diff --git a/dnsmasq.spec b/dnsmasq.spec
index 9853e80..5c969eb 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -10,7 +10,7 @@
 %endif
 
 Name:           dnsmasq
-Version:        2.51
+Version:        2.52
 Release:        1%{?extraversion}%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
@@ -50,7 +50,7 @@ for file in dnsmasq.conf.example man/dnsmasq.8 man/es/dnsmasq.8 src/config.h; do
 done
 
 #enable dbus
-sed -i 's|/* #define HAVE_DBUS */|#define HAVE_DBUS|g' src/config.h
+sed -i 's|/\* #define HAVE_DBUS \*/|#define HAVE_DBUS|g' src/config.h
 
 #enable /etc/dnsmasq.d fix bz 526703
 sed -i 's|#conf-dir=/etc/dnsmasq.d|conf-dir=/etc/dnsmasq.d|g' dnsmasq.conf.example
@@ -118,6 +118,14 @@ fi
 
 
 %changelog
+* Tue Jan 26 2010 Itamar Reis Peixoto <itamar@ispbrasil.com.br> - 2.52-1
+- New Version 2.52
+- fix condrestart() in initscript bz 547605
+- fix sed to enable DBUS(the '*' need some escaping) bz 553161
+
+* Sun Nov 22 2009 Itamar Reis Peixoto <itamar@ispbrasil.com.br> - 2.51-2
+- fix bz 512664
+
 * Sat Oct 17 2009 Itamar Reis Peixoto <itamar@ispbrasil.com.br> - 2.51-1
 - move initscript from patch to a plain text file
 - drop (dnsmasq-configuration.patch) and use sed instead
diff --git a/import.log b/import.log
index 16756c6..3472480 100644
--- a/import.log
+++ b/import.log
@@ -1 +1,2 @@
 dnsmasq-2_51-1_fc12:F-12:dnsmasq-2.51-1.fc12.src.rpm:1258616775
+dnsmasq-2_52-1_fc13:F-12:dnsmasq-2.52-1.fc13.src.rpm:1264526528
diff --git a/sources b/sources
index 4abdca9..ad582af 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0f048f3fd1f3888876867809d162cd89  dnsmasq-2.51.tar.lzma
+2d156f322564fdd71ad238040cd607ac  dnsmasq-2.52.tar.lzma