diff --git a/ChangeLog b/ChangeLog
index 946557069c..f4e65194d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-01-27  Robert Love  <rml@novell.com>
+
+	* configure.in: Require wpa_supplicant.  Detect location of binary and
+	  use it.  Override with "--with-wpa_supplicant=foo".
+	* src/Makefile.am, src/nm-device-802-11-wireless.c: Do not hardcode the
+	  path to wpa_supplicant but use the auto-detected or user-provided
+	  value from configure.
+
 2006-01-27  Robert Love  <rml@novell.com>
 
 	* src/backends/NetworkManagerSuSE.c: If DHCLIENT_SET_HOSTNAME is set
@@ -17,7 +25,7 @@
 
 2006-01-27  Clytie Siddall <clytie@riverland.net.au>
 
-	* configure.in	Added vi in ALL_LINGUAS line.
+	* configure.in:	Added vi in ALL_LINGUAS line.
 	
 2006-01-26  Robert Love  <rml@novell.com>
 
diff --git a/configure.in b/configure.in
index 205bd54547..a643e3d3d3 100644
--- a/configure.in
+++ b/configure.in
@@ -203,6 +203,7 @@ fi
 AC_SUBST(DBUS_SYS_DIR)
 AC_DEFINE_UNQUOTED(DBUS_SYSTEMD_DIR, "$DBUS_SYS_DIR", [Where system.d dir for DBUS is])
 
+# dhcdbd binary path
 AC_ARG_WITH(dhcdbd, AC_HELP_STRING([--with-dhcdbd=/path/to/dhcdbd], [path to dhcdbd])) 
 if test "x${with_dhcdbd}" = x; then
   AC_PATH_PROG(DHCDBD_BINARY_PATH, dhcdbd, [], $PATH:/sbin:/usr/sbin)
@@ -215,6 +216,19 @@ fi
 AC_DEFINE_UNQUOTED(DHCDBD_BINARY_PATH, "$DHCDBD_BINARY_PATH", [Define to path of dhcdbd binary])
 AC_SUBST(DHCDBD_BINARY_PATH)
 
+# wpa_supplicant binary path
+AC_ARG_WITH(wpa_supplicant, AC_HELP_STRING([--with-wpa_supplicant=/path/to/wpa_supplicant], [path to wpa_supplicant]))
+if test "x${with_wpa_supplicant}" = x; then
+  AC_PATH_PROG(WPA_SUPPLICANT_BINARY_PATH, wpa_supplicant, [], $PATH:/sbin:/usr/sbin)
+  if ! test -x "$WPA_SUPPLICANT_BINARY_PATH"; then
+        AC_MSG_ERROR(wpa_supplicant is not installed.  See http://hostap.epitest.fi/wpa_supplicant/)
+  fi
+else
+  WPA_SUPPLICANT_BINARY_PATH="$with_wpa_supplicant"
+fi
+AC_DEFINE_UNQUOTED(WPA_SUPPLICANT_BINARY_PATH, "$WPA_SUPPLICANT_BINARY_PATH", [Define to path of wpa_supplicant binary])
+AC_SUBST(WPA_SUPPLICANT_BINARY_PATH)
+
 #### find the actual value for $prefix that we'll end up with
 ##   (I know this is broken and should be done in the Makefile, but
 ##    that's a major pain and almost nobody actually seems to care)
diff --git a/src/Makefile.am b/src/Makefile.am
index 51bf2770e2..c06a77eedc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -64,17 +64,18 @@ NetworkManager_SOURCES =				\
 		wpa_ctrl.c				\
 		wpa_ctrl.h
 
-NetworkManager_CPPFLAGS = 			\
-	$(DBUS_CFLAGS)					\
-	$(GTHREAD_CFLAGS)				\
-	$(HAL_CFLAGS)					\
-	$(OPENSSL_CFLAGS)				\
-	$(LIBNL_CFLAGS)				\
-	-DDBUS_API_SUBJECT_TO_CHANGE		\
-	-DG_DISABLE_DEPRECATED			\
-	-DBINDIR=\"$(bindir)\"			\
-	-DDATADIR=\"$(datadir)\"			\
-	-DSYSCONFDIR=\"$(sysconfdir)\"	\
+NetworkManager_CPPFLAGS = 							\
+	$(DBUS_CFLAGS)									\
+	$(GTHREAD_CFLAGS)								\
+	$(HAL_CFLAGS)									\
+	$(OPENSSL_CFLAGS)								\
+	$(LIBNL_CFLAGS)								\
+	-DWPA_SUPPLICANT_BIN=\"$(WPA_SUPPLICANT_BINARY_PATH)\"	\
+	-DDBUS_API_SUBJECT_TO_CHANGE						\
+	-DG_DISABLE_DEPRECATED							\
+	-DBINDIR=\"$(bindir)\"							\
+	-DDATADIR=\"$(datadir)\"							\
+	-DSYSCONFDIR=\"$(sysconfdir)\"					\
 	-DARP_DEBUG
 
 
diff --git a/src/nm-device-802-11-wireless.c b/src/nm-device-802-11-wireless.c
index 4727d34c24..e97f10436d 100644
--- a/src/nm-device-802-11-wireless.c
+++ b/src/nm-device-802-11-wireless.c
@@ -2154,7 +2154,6 @@ ap_need_key (NMDevice80211Wireless *self, NMAccessPoint *ap)
 
 #define WPA_SUPPLICANT_GLOBAL_SOCKET		"/var/run/wpa_supplicant-global"
 #define WPA_SUPPLICANT_CONTROL_SOCKET		"/var/run/wpa_supplicant"
-#define WPA_SUPPLICANT_BINARY				"/usr/sbin/wpa_supplicant"
 
 
 static void
@@ -2366,7 +2365,7 @@ supplicant_exec (NMDevice80211Wireless *self)
 	GError *	error = NULL;
 	GPid		pid = -1;
 
-	argv[0] = WPA_SUPPLICANT_BINARY;
+	argv[0] = WPA_SUPPLICANT_BIN;
 	argv[1] = "-g";
 	argv[2] = WPA_SUPPLICANT_GLOBAL_SOCKET;
 	argv[3] = NULL;