diff --git a/AUTHORS b/AUTHORS
index 02539a07..80d98136 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -210,8 +210,10 @@ Thomas Cort
 Toni <bleach at users dot sourceforge dot net>
   exec*/tail/head output evalution
 
-Toni Spets hifi <at users dot sourceforge dot net>
+Toni Spets hifi <spets at users dot sourceforge dot net>
   OpenBSD support
+  Linux wifi code
+  RSS code (created with Mikko Sysikaski)
 
 tyir <tyir at users dot sourceforge dot net>
   MPD features patch 1319461
diff --git a/doc/variables.xml b/doc/variables.xml
index 51729a02..1d92e25d 100644
--- a/doc/variables.xml
+++ b/doc/variables.xml
@@ -559,96 +559,6 @@
 	<para></para></listitem>
 </varlistentry>
 
-<varlistentry>
-	<term>
-		<command><option>wireless_essid</option></command>
-		<option>net</option>
-	</term>
-	<listitem>
-		Wireless access point ESSID (Linux only)
-	<para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-	<term>
-		<command><option>wireless_mode</option></command>
-		<option>net</option>
-	</term>
-	<listitem>
-		Wireless mode (Managed/Ad-Hoc/Master) (Linux only)
-	<para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-	<term>
-		<command><option>wireless_bitrate</option></command>
-		<option>net</option>
-	</term>
-	<listitem>
-		Wireless bitrate (ie 11 Mb/s) (Linux only)
-	<para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-	<term>
-		<command><option>wireless_ap</option></command>
-		<option>net</option>
-	</term>
-	<listitem>
-		Wireless access point MAC address (Linux only)
-	<para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-	<term>
-		<command><option>wireless_link_qual</option></command>
-		<option>net</option>
-	</term>
-	<listitem>
-		Wireless link quality (Linux only)
-	<para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-	<term>
-		<command><option>wireless_link_qual_max</option></command>
-		<option>net</option>
-	</term>
-	<listitem>
-		Wireless link quality maximum value (Linux only)
-	<para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-	<term>
-		<command><option>wireless_link_qual_perc</option></command>
-		<option>net</option>
-	</term>
-	<listitem>
-		Wireless link quality in percents (Linux only)
-	<para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-	<term>
-		<command><option>wireless_link_bar</option></command>
-		<option>(height), (width) net</option>
-	</term>
-	<listitem>
-		Wireless link quality bar (Linux only)
-	<para></para></listitem>
-</varlistentry>
-
-<varlistentry>
-	<term>
-		<command><option>rss</option></command>
-		<option>url delay_in_minutes action item_num</option>
-	</term>
-	<listitem>
-		Download and parse RSS feeds. Action may be one of the following: feed_title, item_title (with num par), item_desc (with num par) and item_titles.
-	<para></para></listitem>
-</varlistentry>
-
 <varlistentry>
 	<term>
 		<command><option>else</option></command>
@@ -1149,16 +1059,6 @@
 	<para></para></listitem>
 </varlistentry>
 
-<varlistentry>
-	<term>
-		<command><option>linkstatus</option></command>
-	<option>interface</option>
-	</term>
-	<listitem>
-		Get the link status for wireless connections
-	<para></para></listitem>
-</varlistentry>
-
 <varlistentry>
 	<term>
 		<command><option>loadavg</option></command>
@@ -1621,6 +1521,16 @@
 		<para></para></listitem>
 </varlistentry>
 
+<varlistentry>
+	<term>
+		<command><option>rss</option></command>
+		<option>url delay_in_minutes action item_num</option>
+	</term>
+	<listitem>
+		Download and parse RSS feeds. Action may be one of the following: feed_title, item_title (with num par), item_desc (with num par) and item_titles.
+	<para></para></listitem>
+</varlistentry>
+
 <varlistentry>
 	<term>
 		<command><option>tab</option></command>
@@ -1803,6 +1713,86 @@
 		<para></para></listitem>
 </varlistentry>
 
+<varlistentry>
+	<term>
+		<command><option>wireless_essid</option></command>
+		<option>net</option>
+	</term>
+	<listitem>
+		Wireless access point ESSID (Linux only)
+	<para></para></listitem>
+</varlistentry>
+
+<varlistentry>
+	<term>
+		<command><option>wireless_mode</option></command>
+		<option>net</option>
+	</term>
+	<listitem>
+		Wireless mode (Managed/Ad-Hoc/Master) (Linux only)
+	<para></para></listitem>
+</varlistentry>
+
+<varlistentry>
+	<term>
+		<command><option>wireless_bitrate</option></command>
+		<option>net</option>
+	</term>
+	<listitem>
+		Wireless bitrate (ie 11 Mb/s) (Linux only)
+	<para></para></listitem>
+</varlistentry>
+
+<varlistentry>
+	<term>
+		<command><option>wireless_ap</option></command>
+		<option>net</option>
+	</term>
+	<listitem>
+		Wireless access point MAC address (Linux only)
+	<para></para></listitem>
+</varlistentry>
+
+<varlistentry>
+	<term>
+		<command><option>wireless_link_qual</option></command>
+		<option>net</option>
+	</term>
+	<listitem>
+		Wireless link quality (Linux only)
+	<para></para></listitem>
+</varlistentry>
+
+<varlistentry>
+	<term>
+		<command><option>wireless_link_qual_max</option></command>
+		<option>net</option>
+	</term>
+	<listitem>
+		Wireless link quality maximum value (Linux only)
+	<para></para></listitem>
+</varlistentry>
+
+<varlistentry>
+	<term>
+		<command><option>wireless_link_qual_perc</option></command>
+		<option>net</option>
+	</term>
+	<listitem>
+		Wireless link quality in percents (Linux only)
+	<para></para></listitem>
+</varlistentry>
+
+<varlistentry>
+	<term>
+		<command><option>wireless_link_bar</option></command>
+		<option>(height), (width) net</option>
+	</term>
+	<listitem>
+		Wireless link quality bar (Linux only)
+	<para></para></listitem>
+</varlistentry>
+
 <varlistentry>
 	<term>
 		<command><option>xmms2_artist</option></command>
diff --git a/src/conky.c b/src/conky.c
index 9dbc8517..77423f24 100644
--- a/src/conky.c
+++ b/src/conky.c
@@ -3584,10 +3584,12 @@ static void generate_text_internal(char *p, int p_max_size, struct text_object *
 						snprintf(p, 4, "%d    ", obj->data.net->link_qual_max);
 				}
 				OBJ(wireless_link_qual_perc) {
-					if (!use_spacer)
-						snprintf(p, p_max_size, "%.0f%%", (double)obj->data.net->link_qual / obj->data.net->link_qual_max * 100);
-					else
-						snprintf(p, 5, "%.0f%%     ", (double)obj->data.net->link_qual / obj->data.net->link_qual_max * 100);
+					if(obj->data.net->link_qual_max > 0) {
+						if (!use_spacer)
+							snprintf(p, p_max_size, "%.0f%%", (double)obj->data.net->link_qual / obj->data.net->link_qual_max * 100);
+						else
+							snprintf(p, 5, "%.0f%%     ", (double)obj->data.net->link_qual / obj->data.net->link_qual_max * 100);
+					} else	snprintf(p, p_max_size, "unk");
 				}
 				OBJ(wireless_link_bar) {
 					new_bar(p, obj->a, obj->b, ((double)obj->data.net->link_qual/obj->data.net->link_qual_max)*255.0);
diff --git a/src/linux.c b/src/linux.c
index 457a4880..6b4c1b13 100644
--- a/src/linux.c
+++ b/src/linux.c
@@ -8,6 +8,7 @@
  * Please see COPYING for details
  *
  * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
+ * Copyright (c) 2007 Toni Spets
  * Copyright (c) 2005-2007 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS)
  * All rights reserved.
  *