diff --git a/srcpkgs/gnuplot/template b/srcpkgs/gnuplot/template
index 72d1c598549..d227de28ca7 100644
--- a/srcpkgs/gnuplot/template
+++ b/srcpkgs/gnuplot/template
@@ -1,13 +1,20 @@
 # Template file for 'gnuplot'
-
 pkgname="gnuplot"
-version="4.6.5"
+version="4.6.6"
 revision=1
 build_style=gnu-configure
 short_desc="portable command-line driven graphing utility"
-maintainer="Martin Riese <grauehaare@gmx.de>"
+maintainer="Eivind Uggedal <eivind@uggedal.com>"
 license="GPL"
 homepage="http://www.gnuplot.info/"
 makedepends="libX11-devel gd-devel"
-distfiles="http://downloads.sourceforge.net/project/gnuplot/gnuplot/${version}/gnuplot-${version}.tar.gz"
-checksum="e550f030c7d04570e89c3d4e3f6e82296816508419c86ab46c4dd73156519a2d"
+distfiles="${SOURCEFORGE_SITE}/gnuplot/gnuplot/${version}/gnuplot-${version}.tar.gz"
+update_ignore="*rc*"
+checksum=1f19596fd09045f22225afbfec11fa91b9ad1d95b9f48406362f517d4f130274
+
+pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		sed -i 's|^\(SUBDIRS =.*\)demo |\1|' Makefile.in
+		sed -i 's|^\(CFLAGS =\).*|\1 -O0|' docs/Makefile.in
+	fi
+}