diff --git a/ChangeLog b/ChangeLog
index 97abfb69c..1afd22e53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-08-14  Dan Williams  <dcbw@redhat.com>
+
+	* callouts/Makefile.am
+	  src/dhcp-manager/nm-dhcp-manager.c
+	  src/dhcp-manager/nm-dhcp-manager.h
+	  src/dhcp-manager/Makefile.am
+		- Change install location of nm-dhcp-client.action to ${prefix}/libexec
+
 2007-08-14  Dan Williams  <dcbw@redhat.com>
 
 	* src/dhcp-manager/nm-dhcp-manager.c
diff --git a/callouts/Makefile.am b/callouts/Makefile.am
index fbb5652e8..a26d5505c 100644
--- a/callouts/Makefile.am
+++ b/callouts/Makefile.am
@@ -1,9 +1,7 @@
 dbusservicedir = $(DBUS_SYS_DIR)
 dbusservice_DATA = nm-dhcp-client.conf
 
-calloutdir = $(sysconfdir)/NetworkManager/callouts
-
-callout_PROGRAMS = nm-dhcp-client.action
+libexec_PROGRAMS = nm-dhcp-client.action
 
 nm_dhcp_client_action_SOURCES = \
 	nm-dhcp-client-action.c
@@ -13,7 +11,8 @@ nm_dhcp_client_action_CPPFLAGS = 		\
 	$(GTHREAD_CFLAGS)					\
 	-DDBUS_API_SUBJECT_TO_CHANGE		\
 	-DG_DISABLE_DEPRECATED				\
-	-DSYSCONFDIR=\"$(sysconfdir)\"
+	-DSYSCONFDIR=\"$(sysconfdir)\"		\
+	-DLIBEXECDIR=\"$(libexecdir)\"
 
 nm_dhcp_client_action_LDADD = 	\
 			$(DBUS_LIBS)		\
diff --git a/src/dhcp-manager/Makefile.am b/src/dhcp-manager/Makefile.am
index 3448bdb30..335ce5dbf 100644
--- a/src/dhcp-manager/Makefile.am
+++ b/src/dhcp-manager/Makefile.am
@@ -25,7 +25,9 @@ libdhcp_manager_la_CPPFLAGS =	$(DBUS_CFLAGS)					\
 						-DG_DISABLE_DEPRECATED			\
 						-DBINDIR=\"$(bindir)\"			\
 						-DDATADIR=\"$(datadir)\"			\
-						-DSYSCONFDIR=\"$(sysconfdir)\"
+						-DSYSCONFDIR=\"$(sysconfdir)\"	\
+						-DLIBEXECDIR=\"$(libexecdir)\"	\
+						-DLOCALSTATEDIR=\"$(localstatedir)\"
 
 
 libdhcp_manager_la_LIBADD = $(DBUS_LIBS) $(GTHREAD_LIBS)
diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c
index 37d792e3b..3df1f5e85 100644
--- a/src/dhcp-manager/nm-dhcp-manager.c
+++ b/src/dhcp-manager/nm-dhcp-manager.c
@@ -37,6 +37,16 @@
 #define NM_DHCP_CLIENT_DBUS_SERVICE "org.freedesktop.nm_dhcp_client"
 #define NM_DHCP_CLIENT_DBUS_IFACE   "org.freedesktop.nm_dhcp_client"
 
+#define NM_DHCP_MANAGER_RUN_DIR		LOCALSTATEDIR "/run"
+
+#define NM_DHCP_MANAGER_PID_FILENAME	"dhclient"
+#define NM_DHCP_MANAGER_PID_FILE_EXT	"pid"
+
+#define NM_DHCP_MANAGER_LEASE_FILENAME	"dhclient"
+#define NM_DHCP_MANAGER_LEASE_FILE_EXT	"lease"
+
+#define ACTION_SCRIPT_PATH	LIBEXECDIR "/nm-dhcp-client.action"
+
 #define NM_DHCP_TIMEOUT   	45 /* DHCP timeout, in seconds */
 
 static const char *dhclient_binary_paths[] =
@@ -662,7 +672,7 @@ dhclient_run (NMDHCPDevice *device)
 #endif
 
 	g_ptr_array_add (dhclient_argv, (gpointer) "-sf");	/* Set script file */
-	g_ptr_array_add (dhclient_argv, (gpointer) SYSCONFDIR "/NetworkManager/callouts/nm-dhcp-client.action" );
+	g_ptr_array_add (dhclient_argv, (gpointer) ACTION_SCRIPT_PATH );
 
 	g_ptr_array_add (dhclient_argv, (gpointer) "-pf");	/* Set pid file */
 	g_ptr_array_add (dhclient_argv, (gpointer) pidfile);
diff --git a/src/dhcp-manager/nm-dhcp-manager.h b/src/dhcp-manager/nm-dhcp-manager.h
index 2525eabfb..1a6b34dd8 100644
--- a/src/dhcp-manager/nm-dhcp-manager.h
+++ b/src/dhcp-manager/nm-dhcp-manager.h
@@ -32,14 +32,6 @@
 #define NM_IS_DHCP_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_DHCP_MANAGER))
 #define NM_DHCP_MANAGER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DHCP_MANAGER, NMDHCPManagerClass))
 
-#define NM_DHCP_MANAGER_RUN_DIR		"/var/run"
-
-#define NM_DHCP_MANAGER_PID_FILENAME	"dhclient"
-#define NM_DHCP_MANAGER_PID_FILE_EXT	"pid"
-
-#define NM_DHCP_MANAGER_LEASE_FILENAME	"dhclient"
-#define NM_DHCP_MANAGER_LEASE_FILE_EXT	"lease"
-
 typedef enum {
 	DHC_NBI=0,		/* no broadcast interfaces found */
 	DHC_PREINIT,		/* configuration started */