diff --git a/ChangeLog b/ChangeLog
index 89c42c55d9..41f34efdbf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-15  Robert Love  <rml@novell.com>
+
+	* src/nm-device-802-11-wireless.c: Use LOCALSTATEDIR preprocessor
+	  define, not an open-coded "/var", for WPA_SUPPLICANT_GLOBAL_SOCKET
+	  and WPA_SUPPLICANT_CONTROL_SOCKET.
+	
 2006-02-15  Robert Love  <rml@novell.com>
 
 	* src/nm-device-802-11-wireless.c, src/nm-device.c: When printing debug
diff --git a/src/nm-device-802-11-wireless.c b/src/nm-device-802-11-wireless.c
index a6e432b442..a8d37d4fb9 100644
--- a/src/nm-device-802-11-wireless.c
+++ b/src/nm-device-802-11-wireless.c
@@ -2016,8 +2016,8 @@ ap_need_key (NMDevice80211Wireless *self,
  *	Free Software Foundation version 2 of the License.
  */
 
-#define WPA_SUPPLICANT_GLOBAL_SOCKET		"/var/run/wpa_supplicant-global"
-#define WPA_SUPPLICANT_CONTROL_SOCKET		"/var/run/wpa_supplicant"
+#define WPA_SUPPLICANT_GLOBAL_SOCKET		LOCALSTATEDIR"/run/wpa_supplicant-global"
+#define WPA_SUPPLICANT_CONTROL_SOCKET		LOCALSTATEDIR"/run/wpa_supplicant"
 
 
 static void