diff --git a/ChangeLog b/ChangeLog
index c6ed366856..a2a554f5be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-08  Dan Williams  <dcbw@redhat.com>
+
+	* src/nm-device-802-11-wireless.c
+		- (get_wireless_capabilities): correctly detect driver WPA
+			capabilities
+
 2006-01-08  Dan Williams  <dcbw@redhat.com>
 
 	* gnome/applet/Makefile.am
diff --git a/src/nm-device-802-11-wireless.c b/src/nm-device-802-11-wireless.c
index c75df728ea..e603528007 100644
--- a/src/nm-device-802-11-wireless.c
+++ b/src/nm-device-802-11-wireless.c
@@ -177,13 +177,13 @@ get_wireless_capabilities (NMDevice80211Wireless *self,
                            iwrange * range,
                            guint32 data_len)
 {
-	int		minlen;
+	guint32	minlen;
 	guint32	caps = NM_802_11_CAP_NONE;
 
 	g_return_val_if_fail (self != NULL, NM_802_11_CAP_NONE);
 	g_return_val_if_fail (range != NULL, NM_802_11_CAP_NONE);
 
-	minlen = ((char *) range->enc_capa) - (char *) range + sizeof (range->enc_capa);
+	minlen = ((char *) &range->enc_capa) - (char *) range + sizeof (range->enc_capa);
 
 	/* All drivers should support WEP by default */
 	caps |= (NM_802_11_CAP_CIPHER_WEP40 | NM_802_11_CAP_CIPHER_WEP104);