Index: bin/named/include/named/globals.h
===================================================================
--- bin/named/include/named/globals.h.orig
+++ bin/named/include/named/globals.h
@@ -134,9 +134,9 @@ EXTERN const char *		lwresd_g_defaultpid
 							     "lwresd.pid");
 #else
 EXTERN const char *		ns_g_defaultpidfile 	INIT(NS_LOCALSTATEDIR
-							     "/run/named.pid");
+							     "/run/named/named.pid");
 EXTERN const char *		lwresd_g_defaultpidfile INIT(NS_LOCALSTATEDIR
-							     "/run/lwresd.pid");
+							     "/run/named/lwresd.pid");
 #endif
 
 EXTERN const char *		ns_g_username		INIT(NULL);
Index: contrib/nanny/nanny.pl
===================================================================
--- contrib/nanny/nanny.pl.orig
+++ contrib/nanny/nanny.pl
@@ -19,7 +19,7 @@
 
 # A simple nanny to make sure named stays running.
 
-$pid_file_location = '/var/run/named.pid';
+$pid_file_location = '/var/run/named/named.pid';
 $nameserver_location = 'localhost';
 $dig_program = 'dig';
 $named_program =  'named';