diff -Naur dhcp-4.2.3-P2-lunar/client/Makefile.in dhcp-4.2.3-P2/client/Makefile.in
--- dhcp-4.2.3-P2-lunar/client/Makefile.in	2011-12-31 01:57:15.000000000 +0100
+++ dhcp-4.2.3-P2/client/Makefile.in	2012-07-31 17:04:25.241389516 +0200
@@ -166,7 +166,7 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-dist_sysconf_DATA = dhclient.conf
+dist_sysconf_DATA =
 dhclient_SOURCES = clparse.c dhclient.c dhc6.c \
 		   scripts/bsdos scripts/freebsd scripts/linux scripts/macos \
 		   scripts/netbsd scripts/nextstep scripts/openbsd \
diff -Naur dhcp-4.2.3-P2-lunar/client/scripts/linux dhcp-4.2.3-P2/client/scripts/linux
--- dhcp-4.2.3-P2-lunar/client/scripts/linux	2011-05-18 22:01:54.000000000 +0200
+++ dhcp-4.2.3-P2/client/scripts/linux	2012-07-31 17:12:47.220376391 +0200
@@ -23,7 +23,7 @@
 # of the $1 in its args.
 
 # 'ip' just looks too weird.  /sbin/ip looks less weird.
-ip=/sbin/ip
+ip=/usr/sbin/ip
 
 make_resolv_conf() {
   if [ x"$new_domain_name_servers" != x ]; then
@@ -49,7 +49,7 @@
     if [ "x${new_dhcp6_domain_search}" != x ] ; then
       echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6
     fi
-    shopt -s nocasematch 
+    shopt -s nocasematch
     for nameserver in ${new_dhcp6_name_servers} ; do
       # If the nameserver has a link-local address
       # add a <zone_id> (interface name) to it.
@@ -61,7 +61,7 @@
       fi
       echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6
     done
-    shopt -u nocasematch 
+    shopt -u nocasematch
 
     mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
   fi
@@ -122,9 +122,9 @@
 if [ x$reason = xPREINIT ]; then
   if [ x$alias_ip_address != x ]; then
     # Bring down alias interface. Its routes will disappear too.
-    ifconfig $interface:0- inet 0
+    /sbin/ifconfig $interface:0- inet 0
   fi
-  ifconfig $interface 0 up
+  /sbin/ifconfig $interface 0 up
 
   # We need to give the kernel some time to get the interface up.
   sleep 1
@@ -135,7 +135,7 @@
 if [ x$reason = xARPCHECK ] || [ x$reason = xARPSEND ]; then
   exit_with_hooks 0
 fi
-  
+
 if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || \
    [ x$reason = xREBIND ] || [ x$reason = xREBOOT ]; then
   current_hostname=`hostname`
@@ -147,51 +147,51 @@
       hostname "$new_host_name"
     fi
   fi
-    
+
   if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \
 		[ x$alias_ip_address != x$old_ip_address ]; then
     # Possible new alias. Remove old alias.
-    ifconfig $interface:0- inet 0
+    /sbin/ifconfig $interface:0- inet 0
   fi
   if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then
     # IP address changed. Bringing down the interface will delete all routes,
     # and clear the ARP cache.
-    ifconfig $interface inet 0 down
+    /sbin/ifconfig $interface inet 0 down
 
   fi
   if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
      [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
 
-    ifconfig $interface inet $new_ip_address $new_subnet_arg \
+    /sbin/ifconfig $interface inet $new_ip_address $new_subnet_arg \
 					$new_broadcast_arg $mtu_arg
     # Add a network route to the computed network address.
     for router in $new_routers; do
       if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
-	route add -host $router dev $interface
+	/sbin/route add -host $router dev $interface
       fi
-      route add default gw $router $metric_arg dev $interface
+      /sbin/route add default gw $router $metric_arg dev $interface
     done
   else
-    # we haven't changed the address, have we changed other options           
+    # we haven't changed the address, have we changed other options
     # that we wish to update?
     if [ x$new_routers != x ] && [ x$new_routers != x$old_routers ] ; then
       # if we've changed routers delete the old and add the new.
       for router in $old_routers; do
-        route del default gw $router
+        /sbin/route del default gw $router
       done
       for router in $new_routers; do
         if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
-	  route add -host $router dev $interface
+	  /sbin/route add -host $router dev $interface
 	fi
-	route add default gw $router $metric_arg dev $interface
+	/sbin/route add default gw $router $metric_arg dev $interface
       done
     fi
   fi
   if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ];
    then
-    ifconfig $interface:0- inet 0
-    ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
-    route add -host $alias_ip_address $interface:0
+    /sbin/ifconfig $interface:0- inet 0
+    /sbin/ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+    /sbin/route add -host $alias_ip_address $interface:0
   fi
   make_resolv_conf
   exit_with_hooks 0
@@ -201,42 +201,42 @@
    || [ x$reason = xSTOP ]; then
   if [ x$alias_ip_address != x ]; then
     # Turn off alias interface.
-    ifconfig $interface:0- inet 0
+    /sbin/ifconfig $interface:0- inet 0
   fi
   if [ x$old_ip_address != x ]; then
     # Shut down interface, which will delete routes and clear arp cache.
-    ifconfig $interface inet 0 down
+    /sbin/ifconfig $interface inet 0 down
   fi
   if [ x$alias_ip_address != x ]; then
-    ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
-    route add -host $alias_ip_address $interface:0
+    /sbin/ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+    /sbin/route add -host $alias_ip_address $interface:0
   fi
   exit_with_hooks 0
 fi
 
 if [ x$reason = xTIMEOUT ]; then
   if [ x$alias_ip_address != x ]; then
-    ifconfig $interface:0- inet 0
+    /sbin/ifconfig $interface:0- inet 0
   fi
-  ifconfig $interface inet $new_ip_address $new_subnet_arg \
+  /sbin/ifconfig $interface inet $new_ip_address $new_subnet_arg \
 					$new_broadcast_arg $mtu_arg
   set $new_routers
   if ping -q -c 1 $1; then
     if [ x$new_ip_address != x$alias_ip_address ] && \
 			[ x$alias_ip_address != x ]; then
-      ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
-      route add -host $alias_ip_address dev $interface:0
+      /sbin/ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+      /sbin/route add -host $alias_ip_address dev $interface:0
     fi
     for router in $new_routers; do
       if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
-	route add -host $router dev $interface
+	/sbin/route add -host $router dev $interface
       fi
-      route add default gw $router $metric_arg dev $interface
+      /sbin/route add default gw $router $metric_arg dev $interface
     done
     make_resolv_conf
     exit_with_hooks 0
   fi
-  ifconfig $interface inet 0 down
+  /sbin/ifconfig $interface inet 0 down
   exit_with_hooks 1
 fi
 
diff -Naur dhcp-4.2.3-P2-lunar/includes/dhcpd.h dhcp-4.2.3-P2/includes/dhcpd.h
--- dhcp-4.2.3-P2-lunar/includes/dhcpd.h	2011-12-31 00:17:04.000000000 +0100
+++ dhcp-4.2.3-P2/includes/dhcpd.h	2012-07-31 17:05:36.444387713 +0200
@@ -1442,7 +1442,7 @@
 #endif
 
 #ifndef _PATH_DHCLIENT_SCRIPT
-#define _PATH_DHCLIENT_SCRIPT	"/sbin/dhclient-script"
+#define _PATH_DHCLIENT_SCRIPT	"/usr/sbin/dhclient-script"
 #endif
 
 #ifndef _PATH_DHCLIENT_PID
diff -Naur dhcp-4.2.3-P2-lunar/server/Makefile.in dhcp-4.2.3-P2/server/Makefile.in
--- dhcp-4.2.3-P2-lunar/server/Makefile.in	2011-12-31 01:57:17.000000000 +0100
+++ dhcp-4.2.3-P2/server/Makefile.in	2012-07-31 17:04:10.082389971 +0200
@@ -177,7 +177,7 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"'
-dist_sysconf_DATA = dhcpd.conf
+dist_sysconf_DATA =
 dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \
 		omapi.c mdb.c stables.c salloc.c ddns.c dhcpleasequery.c \
 		dhcpv6.c mdb6.c ldap.c ldap_casa.c