diff --git a/ChangeLog b/ChangeLog
index c6f43a5b..dfd95aef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,12 @@
 # $Id$
 
+2008-03-31
+	* Conky 1.5.1 released.
+	* Added --enable-testing configure option to use insane compiler flags.
+
 2008-03-30
 	* Added mem_res and mem_vsize to $top.
-	* Improved parsing of diskio args
+	* Improved parsing of $diskio*, $disk_protect and $ioscheduler args.
 
 2008-03-29
 	* Increased C99 compliance.
@@ -20,16 +24,16 @@
 	* Added disk_protect.
 	* Fixed too many open files bug in laptop_mode.
 	* Fixed reading interface adresses.
-	* Fixed battery_bar default size
+	* Fixed battery_bar default size.
 
 2008-03-23
-	* Fixed compilation with --disable-x11
+	* Fixed compilation with --disable-x11.
 	* Fixed linux.c compilation problem due to (suspected) broken linux
-	headers
-	* $battery_bar sysfs fix (thanks Marcus)
+	headers.
+	* $battery_bar sysfs fix (thanks Marcus).
 
 2008-03-22
-	* Conky 1.5.0 released
+	* Conky 1.5.0 released.
 	* Smapi review: improved code, fixed memleaks and smapi_bat_perc when
 	using pad_percents.
 	* Fixed spaced_print, so pad_percents should now work as expected.
@@ -43,8 +47,8 @@
 	* Added CRLF characters to POP3 and IMAP stuff (should play nicer with
 	some servers now).
 	* Added preliminary support for parsing the output of external commands
-	(via $execp and $execpi)
-	* Applied FreeBSD total memory patch (thanks Nikos)
+	(via $execp and $execpi).
+	* Applied FreeBSD total memory patch (thanks Nikos).
 
 2008-03-19
 	* Fixed a number of small memory leaks.
@@ -65,14 +69,14 @@
 		9) added fs_type patch (thanks Ryan)
 		10) added xmms2 fixes patch (thanks Lassi)
 		11) fix sysfs crash patch (thanks Phil)
-		12) multiple ip patch ($addrs)
+		12) multiple ip patch ($addrs).
 	* Added more alignment support (top_middle, bottom_middle, middle_left,
 	and middle_right).
 
 2008-02-08
 	* Applied 2 patches:
-		1) Add diskio for individual devices
-		2) Improved output of units, added "short_units" option
+		1) Add diskio for individual devices.
+		2) Improved output of units, added "short_units" option.
 
 2008-01-05
 	* Applied some more submitted patches:
diff --git a/README b/README
index 3fd29808..102c32d1 100644
--- a/README
+++ b/README
@@ -1551,4 +1551,4 @@ AUTHORS
 
 
 
-				  2007-08-08			      conky(1)
+				  2008-03-31			      conky(1)
diff --git a/configure.ac.in b/configure.ac.in
index 010b9d12..30d6cc67 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -4,7 +4,7 @@ dnl major, minor and micro version macros.
 m4_define([conky_version_major], [1])
 m4_define([conky_version_minor], [5])
 m4_define([conky_version_micro], [1])
-m4_define([conky_version_tag], [pre]) dnl [] for releases
+m4_define([conky_version_tag])dnl, [pre]) dnl [] for releases
 m4_define([conky_version_revision],[_pre@REVISION@])
 m4_define([conky_version],
     [conky_version_major().conky_version_minor().conky_version_micro()ifelse(
@@ -567,11 +567,27 @@ AC_ARG_ENABLE([debug],
 
 if test "x$want_debug" = "xyes" -a $ac_cv_c_compiler_gnu != no; then
   CFLAGS="$CFLAGS -g3 -Werror"
-dnl for more 'extreme' testing
-dnl  CFLAGS="$CFLAGS -g3 -Werror -Wextra -Wunused -Wdeclaration-after-statement -Wundef -Wendif-labels -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wold-style-definition -Winline -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -std=c99 -pedantic -g"
   AC_DEFINE([DEBUG], [], [Define for debugging])
 fi
 
+dnl
+dnl testing
+dnl
+
+AC_ARG_ENABLE([testing],
+              AC_HELP_STRING([--enable-testing], [use strict compiler flags for testing @<:@default=no@:>@]),
+              [want_testing="$enableval"], [want_testing=no])
+
+if test "x$want_testing" = "xyes" -a $ac_cv_c_compiler_gnu != no; then
+  if test "x$want_debug" = "xyes"; then
+    CFLAGS="$CFLAGS -Wextra -Wunused -Wdeclaration-after-statement -Wundef -Wendif-labels -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wold-style-definition -Winline -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -std=c99 -pedantic"
+    AC_DEFINE([TESTING], [], [Define for testing (enables strict compiler flags)])
+  else
+    CFLAGS="$CFLAGS -g3 -Werror -Wextra -Wunused -Wdeclaration-after-statement -Wundef -Wendif-labels -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wold-style-definition -Winline -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -std=c99 -pedantic"
+    AC_DEFINE([TESTING], [], [Define for testing (enables strict compiler flags)])
+  fi
+fi
+
 AC_SUBST(CFLAGS)
 AC_SUBST(X11_LIBS)
 
diff --git a/doc/conky.1 b/doc/conky.1
index 37cafe80..5bef395e 100644
--- a/doc/conky.1
+++ b/doc/conky.1
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH conky 1 2007-08-08 "" ""
+.TH conky 1 2008-03-31 "" ""
 .SH NAME
 conky \- A system monitor for X originally based on the torsmo code, but more kickass. It just keeps on given'er. Yeah.
 .SH SYNOPSIS
diff --git a/doc/docs.xml b/doc/docs.xml
index 1f18fb67..7dd9fdd4 100644
--- a/doc/docs.xml
+++ b/doc/docs.xml
@@ -16,7 +16,7 @@
 			<firstname>Brenden</firstname>
 			<surname>Matthews</surname>
 		</author>
-		<date>2007-08-08</date>
+		<date>2008-03-31</date>
 	</refentryinfo>
 
 	<refmeta>