diff --git a/ChangeLog b/ChangeLog
index e6938ead7e..dd9049e1e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-17  Dan Williams  <dcbw@redhat.com>
+
+	* src/nm-device.c
+		- (nm_device_class_init): connect a default act_stage4_ip_config_timeout
+			function.  Fixes crash when wired DHCP fails.
+
 2006-01-16  Robert Love  <rml@novell.com>
 
 	* src/Makefile.am: Don't install NMLoadModules
diff --git a/src/nm-device.c b/src/nm-device.c
index 4e4d3cd278..d639506185 100644
--- a/src/nm-device.c
+++ b/src/nm-device.c
@@ -1111,7 +1111,7 @@ nm_device_activate_stage4_ip_config_timeout (NMActRequest *req)
 	NMDevice *	self = NULL;
 	NMIP4Config *	ip4_config = NULL;
 	const char *	iface;
-	NMActStageReturn	ret;
+	NMActStageReturn	ret = NM_ACT_STAGE_RETURN_FAILURE;
 
 	g_return_val_if_fail (req != NULL, FALSE);
 
@@ -1964,6 +1964,7 @@ nm_device_class_init (NMDeviceClass *klass)
 	klass->act_stage2_config = real_act_stage2_config;
 	klass->act_stage3_ip_config_start = real_act_stage3_ip_config_start;
 	klass->act_stage4_get_ip4_config = real_act_stage4_get_ip4_config;
+	klass->act_stage4_ip_config_timeout = real_act_stage4_ip_config_timeout;
 
 	g_type_class_add_private (object_class, sizeof (NMDevicePrivate));
 }