diff --git a/srcpkgs/gnuplot-common b/srcpkgs/gnuplot-common
new file mode 120000
index 00000000000..bd10d5b4f72
--- /dev/null
+++ b/srcpkgs/gnuplot-common
@@ -0,0 +1 @@
+gnuplot
\ No newline at end of file
diff --git a/srcpkgs/gnuplot-qt b/srcpkgs/gnuplot-qt
new file mode 120000
index 00000000000..bd10d5b4f72
--- /dev/null
+++ b/srcpkgs/gnuplot-qt
@@ -0,0 +1 @@
+gnuplot
\ No newline at end of file
diff --git a/srcpkgs/gnuplot-wx b/srcpkgs/gnuplot-wx
new file mode 120000
index 00000000000..bd10d5b4f72
--- /dev/null
+++ b/srcpkgs/gnuplot-wx
@@ -0,0 +1 @@
+gnuplot
\ No newline at end of file
diff --git a/srcpkgs/gnuplot/template b/srcpkgs/gnuplot/template
index d227de28ca7..e6ea6cdd5c0 100644
--- a/srcpkgs/gnuplot/template
+++ b/srcpkgs/gnuplot/template
@@ -1,20 +1,115 @@
 # Template file for 'gnuplot'
-pkgname="gnuplot"
-version="4.6.6"
-revision=1
-build_style=gnu-configure
-short_desc="portable command-line driven graphing utility"
+pkgname=gnuplot
+version=4.6.6
+revision=2
+configure_args="--with-readline=builtin"
+hostmakedepends="pkg-config"
+makedepends="zlib-devel libX11-devel gd-devel lua-devel"
+depends="gnuplot-common>=${version}_${revision}"
+replaces="gnuplot<4.6.6_1"
+short_desc="Command-line driven graphing utility"
 maintainer="Eivind Uggedal <eivind@uggedal.com>"
-license="GPL"
 homepage="http://www.gnuplot.info/"
-makedepends="libX11-devel gd-devel"
-distfiles="${SOURCEFORGE_SITE}/gnuplot/gnuplot/${version}/gnuplot-${version}.tar.gz"
 update_ignore="*rc*"
+license="gnuplot"
+distfiles="${SOURCEFORGE_SITE}/gnuplot/gnuplot/${version}/gnuplot-${version}.tar.gz"
 checksum=1f19596fd09045f22225afbfec11fa91b9ad1d95b9f48406362f517d4f130274
 
+subpackages="gnuplot-common"
+if [ -z "$CROSS_BUILD" ]; then
+	makedepends+=" cairo-devel pango-devel wxGTK-devel qt-devel"
+	subpackages+=" gnuplot-wx gnuplot-qt"
+fi
+
 pre_configure() {
+	# fix fonts location
+	sed -i \
+		-e 's|/usr/X11R6/lib/X11/fonts/Type1|/usr/share/fonts/Type1|' \
+		-e 's|/usr/X11R6/lib/X11/fonts/truetype|/usr/share/fonts/TTF|' \
+		-e 's|$(X11ROOT)/X11R6/lib/X11/fonts/Type1|$(X11ROOT)/usr/share/fonts/Type1|' \
+		src/variable.c
+
 	if [ "$CROSS_BUILD" ]; then
 		sed -i 's|^\(SUBDIRS =.*\)demo |\1|' Makefile.in
 		sed -i 's|^\(CFLAGS =\).*|\1 -O0|' docs/Makefile.in
 	fi
+
+	mkdir -p x11
+	mv * x11 || true
+	if [ -z "$CROSS_BUILD" ]; then
+		cp -a x11 wx
+		cp -a x11 qt
+	fi
+}
+
+do_configure() {
+	if [ -z "$CROSS_BUILD" ]; then
+		cd ${wrksrc}/x11
+		./configure ${configure_args} --without-qt --disable-wxwidgets --without-cairo --disable-wxt
+		cd ${wrksrc}/wx
+		./configure ${configure_args}
+		cd ${wrksrc}/qt
+		./configure ${configure_args} --enable-qt --disable-wxwidgets
+	else
+		cd ${wrksrc}/x11
+		./configure ${configure_args}
+	fi
+}
+
+do_build() {
+	make -C x11 ${makejobs}
+	if [ -z "$CROSS_BUILD" ]; then
+		make -C wx ${makejobs}
+		make -C qt ${makejobs}
+	fi
+}
+
+do_install() {
+	# install x11 and rename binary
+	make -C x11 DESTDIR=${DESTDIR} install
+	mv ${DESTDIR}/usr/bin/gnuplot{,-x11}
+	if [ -z "$CROSS_BUILD" ]; then
+		# install qt and rename binary
+		make -C qt DESTDIR=${DESTDIR} install
+		mv ${DESTDIR}/usr/bin/gnuplot{,-qt}
+		# install wx
+		make -C wx DESTDIR=${DESTDIR} install
+	fi
+	vlicense x11/Copyright LICENSE
+}
+
+gnuplot-common_package() {
+	replaces="gnuplot<4.6.6_1"
+	short_desc+=" - common files"
+	pkg_install() {
+		vmove usr/share/gnuplot/${version%.*}/PostScript
+		vmove usr/share/gnuplot/${version%.*}/app-defaults
+		vmove usr/share/gnuplot/${version%.*}/js
+		vmove usr/share/gnuplot/${version%.*}/lua
+		vmove usr/share/gnuplot/${version%.*}/*.gp
+		vmove usr/share/gnuplot/${version%.*}/gnuplot.gih
+		vmove usr/share/gnuplot/${version%.*}/gnuplotrc
+		vmove usr/share/gnuplot/${version%.*}/gnuplot.pdf
+		vmove usr/share/licenses/gnuplot
+		vmove usr/share/man/man1/gnuplot.1
+	}
+}
+
+gnuplot-wx_package() {
+	replaces="gnuplot<4.6.6_1"
+	depends="gnuplot-common>=${version}_${revision}"
+	short_desc+=" - wxWidgets frontend"
+	pkg_install() {
+		vmove usr/bin/gnuplot
+	}
+}
+
+gnuplot-qt_package() {
+	depends="gnuplot-common>=${version}_${revision}"
+	short_desc+=" - Qt frontend"
+	pkg_install() {
+		vmove usr/bin/gnuplot-qt
+		vmove usr/libexec/gnuplot/${version%.*}/gnuplot_qt
+		vmove usr/share/gnuplot/${version%.*}/qt
+	}
 }