--- src/netcfg-2.5.4/src/8021x	2010-02-21 13:17:35.000000000 +0100
+++ src.new/netcfg-2.5.4/src/8021x	2010-06-02 21:24:12.000000000 +0200
@@ -58,6 +58,7 @@
     echo "ctrl_interface=/var/run/wpa_supplicant" >> "$WPA_CONF/wpa.conf"    # we know $WPA_CONF now has no spaces, but it may have other nasty chars, so still needs to be quoted
     echo "ctrl_interface_group=${WPA_GROUP:-wheel}" >> "$WPA_CONF/wpa.conf"
     [[ $WPA_COUNTRY ]] && echo "country=$WPA_COUNTRY" >> "$WPA_CONF/wpa.conf"
+    [[ $ADHOC_MODE ]] && echo "ap_scan=2" >> "$WPA_CONF/wpa.conf"
     echo "$WPA_CONF/wpa.conf"
 }
 
@@ -65,6 +66,7 @@
 make_wpa_config() {
     case $SECURITY in
     wep|wep-old)
+        [[ $ADHOC_MODE ]] && echo "mode=1"
         if [[ ${KEY:0:2} == "s:" ]]; then # TODO: does wpa_supplicant handle this as expected?
             echo "ssid=\"$ESSID\" \nkey_mgmt=NONE \nwep_key0=\"${KEY:2}\" \nwep_tx_keyidx=0"
         else
@@ -72,6 +74,7 @@
         fi
         ;;
     none|none-old)
+        [[ $ADHOC_MODE ]] && echo "mode=1"
         echo "ssid=\"$ESSID\" \nkey_mgmt=NONE"
         ;;
     wpa)