diff --git a/sci-visualization/gnuplot/gnuplot-5.0.6.recipe b/sci-visualization/gnuplot/gnuplot-5.0.7.recipe
similarity index 75%
rename from sci-visualization/gnuplot/gnuplot-5.0.6.recipe
rename to sci-visualization/gnuplot/gnuplot-5.0.7.recipe
index d2f4c31e6..d86a5d0de 100644
--- a/sci-visualization/gnuplot/gnuplot-5.0.6.recipe
+++ b/sci-visualization/gnuplot/gnuplot-5.0.7.recipe
@@ -3,22 +3,29 @@ DESCRIPTION="Originally created to allow both students and scientists to \
 visualize mathematical functions and data interactively, but has grown to \
 support many non-interactive uses such as web scripting. It is also used \
 as a plotting engine by third-party applications like Octave."
-HOMEPAGE="http://www.gnuplot.info"
-COPYRIGHT="1986 - 1993, 1998, 2004 Thomas Williams, Colin Kelley"
+HOMEPAGE="http://www.gnuplot.info/"
+COPYRIGHT="1986-1993, 1998, 2004-2018 Thomas Williams, Colin Kelley"
 LICENSE="Gnuplot"
 REVISION="2"
-SOURCE_URI="http://downloads.sourceforge.net/gnuplot/gnuplot-$portVersion.tar.gz"
-CHECKSUM_SHA256="5bbe4713e555c2e103b7d4ffd45fca69551fff09cf5c3f9cb17428aaacc9b460"
+SOURCE_URI="https://downloads.sourceforge.net/gnuplot/gnuplot-$portVersion.tar.gz"
+CHECKSUM_SHA256="0ad760ff013b4a9cf29853fa9b50c50030a33cd8fb86220a23abb466655136fc"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
 PROVIDES="
 	gnuplot$secondaryArchSuffix = $portVersion
-	cmd:gnuplot$secondaryArchSuffix = $portVersion
+	cmd:gnuplot$commandSuffix = $portVersion
 	"
 REQUIRES="
-	haiku${secondaryArchSuffix}
+	haiku$secondaryArchSuffix
 	lib:libfontconfig$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
 	lib:libgd$secondaryArchSuffix
@@ -35,7 +42,7 @@ REQUIRES="
 	lib:libQt5Widgets$secondaryArchSuffix
 	lib:libreadline$secondaryArchSuffix
 	lib:libtiff$secondaryArchSuffix
-	lib:libvpx$secondaryArchSuffix
+	lib:libvpx$secondaryArchSuffix >= 5
 	lib:libz$secondaryArchSuffix
 	"
 
@@ -54,7 +61,7 @@ BUILD_REQUIRES="
 	devel:libQt5Svg$secondaryArchSuffix
 	devel:libQt5Widgets$secondaryArchSuffix
 	devel:libreadline$secondaryArchSuffix
-	devel:libvpx$secondaryArchSuffix
+	devel:libvpx$secondaryArchSuffix >= 5
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
@@ -81,7 +88,10 @@ BUILD()
 	export CXXFLAGS="-std=c++11"
 	aclocal
 	automake
-	runConfigure ./configure --without-cairo --with-qt
+	runConfigure --omit-dirs binDir ./configure --bindir="$commandBinDir" \
+		--without-cairo \
+		--with-qt \
+
 	make $jobArgs
 }
 
@@ -89,3 +99,8 @@ INSTALL()
 {
 	make install-strip
 }
+
+TEST()
+{
+	make check
+}