diff --git a/.cvsignore b/.cvsignore
index b97ee57..b1c6b85 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -3,3 +3,4 @@ wpa_supplicant-0.4.7.tar.gz
 wpa_supplicant-0.5.1.tar.gz
 wpa_supplicant-0.4.8.tar.gz
 madwifi-headers-r1475.tar.bz2
+wpa_supplicant-0.4.9.tar.gz
diff --git a/sources b/sources
index 633e9c7..dd14792 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-765d6c70d75e88cd4dc010fa6b52c45f  wpa_supplicant-0.4.8.tar.gz
 b82289b140cc1c66db11564bde248d8a  madwifi-headers-r1475.tar.bz2
+98498c152cbfc388c306fd9bbf7d57d4  wpa_supplicant-0.4.9.tar.gz
diff --git a/wpa_supplicant-driver-wext-debug.patch b/wpa_supplicant-driver-wext-debug.patch
index a79d145..8962ebf 100644
--- a/wpa_supplicant-driver-wext-debug.patch
+++ b/wpa_supplicant-driver-wext-debug.patch
@@ -1,6 +1,6 @@
---- wpa_supplicant-0.4.8/driver_wext.c.debug	2006-03-03 22:57:59.000000000 -0500
-+++ wpa_supplicant-0.4.8/driver_wext.c	2006-03-03 22:58:41.000000000 -0500
-@@ -1612,20 +1612,32 @@
+--- wpa_supplicant-0.4.9/driver_wext.c.driver-wext-debug	2006-04-29 20:21:38.000000000 -0400
++++ wpa_supplicant-0.4.9/driver_wext.c	2006-10-02 13:43:18.000000000 -0400
+@@ -1633,20 +1633,32 @@
  	 */
  	if (drv->auth_alg_fallback &&
  	    wpa_driver_wext_auth_alg_fallback(drv, params) < 0)
@@ -33,7 +33,7 @@
  	if (params->wpa_ie == NULL || params->wpa_ie_len == 0)
  		value = IW_AUTH_WPA_VERSION_DISABLED;
  	else if (params->wpa_ie[0] == RSN_INFO_ELEM)
-@@ -1634,23 +1646,38 @@
+@@ -1655,26 +1667,41 @@
  		value = IW_AUTH_WPA_VERSION_WPA;
  	if (wpa_driver_wext_set_auth_param(drv,
  					   IW_AUTH_WPA_VERSION, value) < 0)
@@ -62,7 +62,10 @@
 +wpa_printf(MSG_DEBUG, "%s: assoc failed because set_auth_param(KEY_MGMT) failed", __FUNCTION__);
  		ret = -1;
 +}
- 	value = params->key_mgmt_suite != KEY_MGMT_NONE;
+ 	value = params->key_mgmt_suite != KEY_MGMT_NONE ||
+ 		params->pairwise_suite != CIPHER_NONE ||
+ 		params->group_suite != CIPHER_NONE ||
+ 		params->wpa_ie_len;
  	if (wpa_driver_wext_set_auth_param(drv,
  					   IW_AUTH_PRIVACY_INVOKED, value) < 0)
 +{
@@ -72,7 +75,7 @@
  
  	/* Allow unencrypted EAPOL messages even if pairwise keys are set when
  	 * not using WPA. IEEE 802.1X specifies that these frames are not
-@@ -1664,14 +1691,26 @@
+@@ -1688,14 +1715,26 @@
  	if (wpa_driver_wext_set_auth_param(drv,
  					   IW_AUTH_RX_UNENCRYPTED_EAPOL,
  					   allow_unencrypted_eapol) < 0)
@@ -99,7 +102,7 @@
  
  	return ret;
  }
-@@ -1696,6 +1735,8 @@
+@@ -1720,6 +1759,8 @@
  	res = wpa_driver_wext_set_auth_param(drv, IW_AUTH_80211_AUTH_ALG,
  					     algs);
  	drv->auth_alg_fallback = res == -2;
diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec
index f17b323..285e132 100644
--- a/wpa_supplicant.spec
+++ b/wpa_supplicant.spec
@@ -1,8 +1,8 @@
 Summary: WPA/WPA2/IEEE 802.1X Supplicant
 Name: wpa_supplicant
 Epoch: 1
-Version: 0.4.8
-Release: 10.1.fc6
+Version: 0.4.9
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz
@@ -11,15 +11,11 @@ Source2: %{name}.conf
 Source3: %{name}.init.d
 Source4: %{name}.sysconfig
 Source5: madwifi-headers-r1475.tar.bz2
-Patch0: wpa_supplicant-auth-fallback-v4.patch
-Patch1: wpa_supplicant-ctrl-iface-ap-scan.patch
-Patch2: wpa_supplicant-ctrl-iface-hide-keys.patch
-Patch3: wpa_supplicant-assoc-timeout.patch
-Patch4: wpa_supplicant-driver-wext-debug.patch
-Patch5: wpa_supplicant-wep-key-fix.patch
-Patch6: wpa_supplicant-ssid-len-fix.patch
-Patch7: wpa_supplicant-0.4.8-madwifi-privacy-invoked-fix.patch
-Patch8: wpa_supplicant-0.4.8-madwifi-ioctl-reorder.patch
+Patch0: wpa_supplicant-ctrl-iface-ap-scan.patch
+Patch1: wpa_supplicant-assoc-timeout.patch
+Patch2: wpa_supplicant-driver-wext-debug.patch
+Patch3: wpa_supplicant-wep-key-fix.patch
+Patch4: wpa_supplicant-0.4.8-madwifi-ioctl-reorder.patch
 URL: http://hostap.epitest.fi/wpa_supplicant/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -45,15 +41,11 @@ Graphical User Interface for wpa_supplicant written using QT3
 
 %prep
 %setup -q
-%patch0 -p0 -b .we-auth-fallback
-%patch1 -p1 -b .ap-scan
-%patch2 -p1 -b .ctrl-iface-hide-keys
-%patch3 -p1 -b .assoc-timeout
-%patch4 -p1 -b .driver-wext-debug
-%patch5 -p1 -b .wep-key-fix
-%patch6 -p1 -b .ssid-len-fix
-%patch7 -p1 -b .madwifi-privacy-invoked-fix
-%patch8 -p1 -b .madwifi-ioctl-reorder
+%patch0 -p1 -b .ap-scan
+%patch1 -p1 -b .assoc-timeout
+%patch2 -p1 -b .driver-wext-debug
+%patch3 -p1 -b .wep-key-fix
+%patch4 -p1 -b .madwifi-ioctl-reorder
 
 %build
 cp %{SOURCE1} ./.config
@@ -114,7 +106,7 @@ fi
 
 %files
 %defattr(-, root, root)
-%doc COPYING ChangeLog README README-Windows.txt eap_testing.txt todo.txt wpa_supplicant.conf doc examples
+%doc COPYING ChangeLog README README-Windows.txt eap_testing.txt todo.txt wpa_supplicant.conf examples
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %{_sysconfdir}/rc.d/init.d/%{name}
@@ -131,6 +123,11 @@ fi
 %{_bindir}/wpa_gui
 
 %changelog
+* Mon Oct 27 2006 Dan Williams <dcbw@redhat.com> - 0.4.9-1
+- Update to 0.4.9 for WE-21 fixes, remove upstreamed patches
+- Don't package doc/ because they aren't actually wpa_supplicant user documentation,
+    and becuase it pulls in perl
+
 * Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 0.4.8-10.1
 - rebuild