diff --git a/ChangeLog b/ChangeLog
index 120a329f61..c92ad7bfe1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-28  Robert Love  <rml@novell.com>
+
+	* libnm-util/dbus-helpers.c, src/nm-ap-security-wpa-eap.c,
+	  src/nm-ap-security-wpa-psk.c: Fix FIXMEs: Callers of the DBUS
+	  deserializers are responsible for freeing the returned DBUS strings.
+
 2006-02-27  Christopher Aillon  <caillon@redhat.com>
 
 	* src/nm-device-802-11-wireless.c:
@@ -161,7 +167,7 @@
 	Patch from Dan Winship <danw@novell.com>:
 	* gnome/applet/eggtrayicon.c: Update EggTrayIcon code.  Set the gdk
 	  area to transparent.
-	  
+
 2006-02-21  Dan Williams  <dcbw@redhat.com>
 
 	* gnome/applet/applet.[ch]
diff --git a/libnm-util/dbus-helpers.c b/libnm-util/dbus-helpers.c
index 38bf32e90a..493b952bd6 100644
--- a/libnm-util/dbus-helpers.c
+++ b/libnm-util/dbus-helpers.c
@@ -57,6 +57,11 @@ nmu_security_serialize_wep (DBusMessageIter *iter,
 	return TRUE;
 }
 
+/*
+ * nmu_security_deserialize_wep
+ *
+ * Callers are responsible for freeing 'key' via dbus_free().
+ */
 dbus_bool_t
 nmu_security_deserialize_wep (DBusMessageIter *iter,
 						char **key,
@@ -162,6 +167,11 @@ nmu_security_serialize_wpa_psk (DBusMessageIter *iter,
 	return TRUE;
 }
 
+/*
+ * nmu_security_deserialize_wpa_psk
+ *
+ * Callers are responsible for freeing 'key' via dbus_free().
+ */
 dbus_bool_t
 nmu_security_deserialize_wpa_psk (DBusMessageIter *iter,
 						    char **key,
@@ -326,7 +336,13 @@ nmu_security_serialize_wpa_eap_with_cipher (DBusMessageIter *iter,
 	return result;
 }
 
-
+/*
+ * nmu_security_deserialize_wpa_eap
+ *
+ * Callers are responsible for freeing identity, passwd, anon_identity,
+ * private_key_passwd, private_key_file, client_cert_file, and ca_cert_file
+ * via dbus_free().
+ */
 dbus_bool_t
 nmu_security_deserialize_wpa_eap (DBusMessageIter *iter,
 						    int *eap_method,
diff --git a/src/nm-ap-security-wpa-eap.c b/src/nm-ap-security-wpa-eap.c
index b778bb0b73..88ddf8a613 100644
--- a/src/nm-ap-security-wpa-eap.c
+++ b/src/nm-ap-security-wpa-eap.c
@@ -86,13 +86,19 @@ nm_ap_security_wpa_eap_new_deserialize (DBusMessageIter *iter)
 	security->priv->ca_cert_file = g_strdup (ca_cert_file);
 	security->priv->wpa_version = wpa_version;
 
-	/* FIXME: free passwd, cert_file, and key_file ? */
-
 	if (wpa_version == IW_AUTH_WPA_VERSION_WPA2)
 		nm_ap_security_set_description (NM_AP_SECURITY (security), _("WPA2 Enterprise"));
 	else
 		nm_ap_security_set_description (NM_AP_SECURITY (security), _("WPA Enterprise"));
 
+	dbus_free (identity);
+	dbus_free (passwd);
+	dbus_free (anon_identity);
+	dbus_free (private_key_passwd);
+	dbus_free (private_key_file);
+	dbus_free (client_cert_file);
+	dbus_free (ca_cert_file);
+
 out:
 	return security;
 }
diff --git a/src/nm-ap-security-wpa-psk.c b/src/nm-ap-security-wpa-psk.c
index 18b83b2d44..4f2a307544 100644
--- a/src/nm-ap-security-wpa-psk.c
+++ b/src/nm-ap-security-wpa-psk.c
@@ -83,7 +83,10 @@ nm_ap_security_wpa_psk_new_deserialize (DBusMessageIter *iter, int we_cipher)
 	security = g_object_new (NM_TYPE_AP_SECURITY_WPA_PSK, NULL);
 	nm_ap_security_set_we_cipher (NM_AP_SECURITY (security), we_cipher);
 	if (key)
-		nm_ap_security_set_key (NM_AP_SECURITY (security), key, key_len); /* FIXME: Free 'key' ? */
+	{
+		nm_ap_security_set_key (NM_AP_SECURITY (security), key, key_len);
+		dbus_free (key);
+	}
 	security->priv->wpa_version = wpa_version;
 	security->priv->key_mgt = key_mgt;
 
diff --git a/src/vpn-manager/nm-vpn-act-request.c b/src/vpn-manager/nm-vpn-act-request.c
index ab283536bd..3e74d181c1 100644
--- a/src/vpn-manager/nm-vpn-act-request.c
+++ b/src/vpn-manager/nm-vpn-act-request.c
@@ -41,7 +41,7 @@ struct NMVPNActRequest
 	char **			data_items;
 	int				data_count;
 	char **			user_routes;
-	int 			user_routes_count;
+	int				user_routes_count;
 
 	guint			daemon_wait_count;
 	guint			callback_id;
@@ -50,8 +50,8 @@ struct NMVPNActRequest
 
 
 NMVPNActRequest *nm_vpn_act_request_new (NMVPNManager *manager, NMVPNService *service, NMVPNConnection *vpn,
-					NMDevice *parent_dev, char **password_items, int password_count, char **data_items, int data_count,
-					char **user_routes, int user_routes_count)
+								 NMDevice *parent_dev, char **password_items, int password_count,
+								  char **data_items, int data_count, char **user_routes, int user_routes_count)
 {
 	NMVPNActRequest	*req;