--- src/connections/wireless.orig	2010-05-19 20:25:06.992031775 +0200
+++ src/connections/wireless	2010-05-19 20:53:28.485195678 +0200
@@ -12,24 +12,24 @@ iwconfig_up() {
     if [[ -z "$WEP_OPTS" ]]; then
         if [[ "$SECURITY" = "wep-old" ]]; then
             if [[ -n "$AP" ]]; then
-                WEP_OPTS="ap \"$AP\" key $KEY"
+                WEP_OPTS=(ap "$AP" key "$KEY")
             else
-                WEP_OPTS="essid \"$ESSID\" key $KEY"
+                WEP_OPTS=(essid "$ESSID" key "$KEY")
             fi
         elif [[ "$SECURITY" = "none-old" ]]; then
             if [[ -n "$AP" ]]; then
-                WEP_OPTS="ap \"$AP\""
+                WEP_OPTS=(ap "$AP")
             else
-                WEP_OPTS="essid \"$ESSID\""
+                WEP_OPTS=(essid "$ESSID")
             fi
         fi
     fi
 
     quirk "predown" && bring_interface down "$INTERFACE" # madwifi FS#10585
 
-    report_debug wireless_up iwconfig "$INTERFACE" $WEP_OPTS
+    report_debug wireless_up iwconfig "$INTERFACE" "${WEP_OPTS[@]}"
 
-    if ! iwconfig "$INTERFACE" $WEP_OPTS; then
+    if ! iwconfig "$INTERFACE" "${WEP_OPTS[@]}"; then
         report_fail "Could not set wireless configuration."
         return 1
     fi