diff --git a/.gitignore b/.gitignore
index 8ae131ee..5285e7b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,5 +34,3 @@ conky-*.tar.*
 doc/*.html
 doc/*.mxml
 patches/
-README
-doc/conky.1
diff --git a/ChangeLog b/ChangeLog
index fb7be043..0f0c47c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,3 @@
-2009-05-03
-	* Added Sony VAIO fanspeed info (thanks Yeon-Hyeong)
-
 2009-05-01
 	* Added diskio_avg_samples patch (thanks Yeon-Hyeong)
 	* Fixed $texeci regression
diff --git a/doc/variables.xml b/doc/variables.xml
index 85d033db..a964baf4 100644
--- a/doc/variables.xml
+++ b/doc/variables.xml
@@ -2733,7 +2733,6 @@
 			Prints the song name in either the form "artist - title" or file name, depending on whats available
 			<para></para></listitem>
 	</varlistentry>
-
 	<varlistentry>
 		<term>
 			<command><option>if_xmms2_connected</option></command>
@@ -2743,15 +2742,6 @@
 			<para></para></listitem>
 	</varlistentry>
 
-	<varlistentry>
-		<term>
-			<command><option>sony_fanspeed</option></command>
-		</term>
-		<listitem>
-			Displays the Sony VAIO fanspeed information if sony-laptop kernel support is enabled.  Linux only.
-			<para></para></listitem>
-	</varlistentry>
-
 	<varlistentry>
 		<term>
 			<command><option>eve</option></command>
diff --git a/src/Makefile.am b/src/Makefile.am
index c31f4556..b7fee6fa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -64,7 +64,7 @@ xmms2 = xmms2.c
 endif
 
 if BUILD_LINUX
-linux = linux.c top.c diskio.c users.c sony.c
+linux = linux.c top.c diskio.c users.c
 PTHREAD_LIBS =  -lpthread
 endif
 
@@ -208,7 +208,6 @@ EXTRA_DIST = \
 	smapi.h                 \
 	ibm.c                   \
 	ibm.h                   \
-	sony.h                  \
 	users.c
 
 
diff --git a/src/conky.c b/src/conky.c
index 6379d8ae..8c9eba2a 100644
--- a/src/conky.c
+++ b/src/conky.c
@@ -1223,9 +1223,6 @@ static struct text_object *construct_text_object(const char *s,
 	END OBJ(ibm_volume, 0)
 	END OBJ(ibm_brightness, 0)
 #endif
-	/* information from sony_laptop kernel module
-	 * /sys/devices/platform/sony-laptop */
-	END OBJ(sony_fanspeed, 0)
 	END OBJ_IF(if_gw, 0)
 	END OBJ(ioscheduler, 0)
 		if (!arg) {
@@ -2545,7 +2542,7 @@ static struct text_object *construct_text_object(const char *s,
 					}else if(arg[i] == '}') {
 						indenting--;
 					}
-					if(indenting == 0 && (arg[i+1] == ' ' || arg[i+1] == '$' || arg[i+1] == 0)) {
+					if(indenting == 0 && arg[i+1] < 48) {	//<48 has 0, $, and the most used chars not used in varnames but not { or } 
 						endvar[j]=i+1;
 						j++;
 					}
@@ -3418,11 +3415,6 @@ static void generate_text_internal(char *p, int p_max_size,
 				get_ibm_acpi_brightness(p, p_max_size);
 			}
 #endif /* IBM */
-			/* information from sony_laptop kernel module
-			 * /sys/devices/platform/sony-laptop */
-			OBJ(sony_fanspeed) {
-				get_sony_fanspeed(p, p_max_size);
-			}
 			OBJ(if_gw) {
 				if (!cur->gw_info.count) {
 					DO_JUMP;
diff --git a/src/conky.h b/src/conky.h
index 3bd82ea8..dda42c55 100644
--- a/src/conky.h
+++ b/src/conky.h
@@ -103,9 +103,6 @@ char *strndup(const char *s, size_t n);
 #include "smapi.h"
 #endif
 
-/* sony support */
-#include "sony.h"
-
 /* A size for temporary, static buffers to use when
  * one doesn't know what to choose. Defaults to 256.  */
 extern unsigned int text_buffer_size;
diff --git a/src/text_object.h b/src/text_object.h
index 067c7a5c..d9a48ad7 100644
--- a/src/text_object.h
+++ b/src/text_object.h
@@ -148,9 +148,6 @@ enum text_object_type {
 	OBJ_smapi_bat_power,
 	OBJ_if_smapi_bat_installed,
 #endif /* IBM */
-	/* information from sony_laptop kernel module
-	 * /sys/devices/platform/sony-laptop */
-	OBJ_sony_fanspeed,
 	OBJ_if_gw,
 	OBJ_ioscheduler,
 	OBJ_gw_iface,