diff --git a/ChangeLog b/ChangeLog
index af132e05..7575d35c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 # $Id$
 
+2006-08-27
+	* Fix compilation errors when building with --diable-x11; bug #1547164
+
 2006-08-12
 	* Make configure script print summary info
 	* Make `conky -v` show compiled-in features
diff --git a/README b/README
index f293e9c6..5c0cecc2 100644
--- a/README
+++ b/README
@@ -474,8 +474,8 @@ VARIABLES
 
        cpu (cpuN)
 	      CPU usage in percents. For SMP machines, the CPU number  can  be
-	      provided as an argument. cpu0 is the total usage, and >=cpu1 are
-	      individual CPUs.
+	      provided	as an argument. ${cpu 0} is the total usage, and ${cpu
+	      X} (X >= 1) are individual CPUs.
 
 
        cpubar (cpu number) (height),(width)
diff --git a/doc/conky.1 b/doc/conky.1
index 8247deac..afe8cab7 100644
--- a/doc/conky.1
+++ b/doc/conky.1
@@ -446,7 +446,7 @@ Change drawing color to color
 
 .TP 
 \fB\*(T<\fBcpu\fR\*(T>\fR \*(T<\fB(cpuN)\fR\*(T> 
-CPU usage in percents. For SMP machines, the CPU number can be provided as an argument. cpu0 is the total usage, and >=cpu1 are individual CPUs. 
+CPU usage in percents. For SMP machines, the CPU number can be provided as an argument. ${cpu 0} is the total usage, and ${cpu X} (X >= 1) are individual CPUs. 
 
 .TP 
 \fB\*(T<\fBcpubar\fR\*(T>\fR \*(T<\fB(cpu number) (height),(width)\fR\*(T> 
diff --git a/src/conky.c b/src/conky.c
index 6de34430..d1adeccc 100644
--- a/src/conky.c
+++ b/src/conky.c
@@ -328,7 +328,7 @@ static int fixed_size = 0, fixed_pos = 0;
 static int minimum_width, minimum_height;
 static int maximum_width;
 
-
+#endif /* X11 */
 
 #ifdef HAVE_ICONV
 #define CODEPAGE_LENGTH 20
@@ -376,8 +376,6 @@ void free_iconv(void)
 /* UTF-8 */
 int utf8_mode = 0;
 
-#endif /* X11 */
-
 /* no buffers in used memory? */
 int no_buffers;