diff --git a/sci-mathematics/octave/octave-4.2.1.recipe b/sci-mathematics/octave/octave-5.1.0.recipe
similarity index 64%
rename from sci-mathematics/octave/octave-4.2.1.recipe
rename to sci-mathematics/octave/octave-5.1.0.recipe
index bcca2e0e4..b78553d2d 100644
--- a/sci-mathematics/octave/octave-4.2.1.recipe
+++ b/sci-mathematics/octave/octave-5.1.0.recipe
@@ -3,16 +3,21 @@ DESCRIPTION="GNU Octave is a high-level language, primarily intended for \
 numerical computations.  It provides a convenient command line interface \
 for solving linear and nonlinear problems numerically."
 HOMEPAGE="http://www.octave.org/"
-COPYRIGHT="1996-2017 John W. Eaton"
+COPYRIGHT="1996-2019 John W. Eaton"
 LICENSE="GNU GPL v3"
-REVISION="5"
+REVISION="1"
 SOURCE_URI="https://ftp.gnu.org/gnu/octave/octave-$portVersion.tar.gz"
-CHECKSUM_SHA256="80c28f6398576b50faca0e602defb9598d6f7308b0903724442c2a35a605333b"
+CHECKSUM_SHA256="e36b1124cac27c7caa51cc57de408c31676d5f0096349b4d50b57bfe1bcd7495"
 PATCHES="octave-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="?x86"
 
+liboctaveVersion="7.0.0"
+liboctaveVersionCompat="$liboctaveVersion compat >= ${liboctaveVersion%%.*}"
+liboctinterpVersion="7.0.0"
+liboctinterpVersionCompat="$liboctinterpVersion compat >= ${liboctinterpVersion%%.*}"
+
 PROVIDES="
 	octave$secondaryArchSuffix = $portVersion
 	cmd:mkoctfile$secondaryArchSuffix = $portVersion
@@ -23,16 +28,23 @@ PROVIDES="
 	cmd:octave_cli_$portVersion$secondaryArchSuffix = $portVersion
 	cmd:octave_config$secondaryArchSuffix = $portVersion
 	cmd:octave_config_$portVersion$secondaryArchSuffix = $portVersion
-	lib:liboctave$secondaryArchSuffix = $portVersion
-	lib:liboctinterp$secondaryArchSuffix = $portVersion
+	lib:liboctave$secondaryArchSuffix = $liboctaveVersionCompat
+	lib:liboctinterp$secondaryArchSuffix = $liboctinterpVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	cmd:gnuplot$secondaryArchSuffix
+	cmd:gnuplot
 	cmd:gs
+	lib:libamd$secondaryArchSuffix
+	lib:libarpack$secondaryArchSuffix
 	lib:libbz2$secondaryArchSuffix
+	lib:libcamd$secondaryArchSuffix
+	lib:libccolamd$secondaryArchSuffix
+	lib:libcholmod$secondaryArchSuffix
+	lib:libcolamd$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
 	lib:libcurl$secondaryArchSuffix
+	lib:libcxsparse$secondaryArchSuffix
 	lib:libfftw3$secondaryArchSuffix
 	lib:libfontconfig$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
@@ -41,9 +53,10 @@ REQUIRES="
 	lib:libGLU$secondaryArchSuffix
 	lib:libgomp$secondaryArchSuffix
 #	lib:libgraphicsmagick$secondaryArchSuffix
-#	lib:libhdf5$secondaryArchSuffix
-#	lib:liblapack$secondaryArchSuffix
-#	lib:libmagick++_6.q16$secondaryArchSuffix
+	lib:libhdf5$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:liblapack$secondaryArchSuffix
+	lib:libmagick++_6.q16$secondaryArchSuffix
 	lib:libncursesw$secondaryArchSuffix
 	lib:libopenblas$secondaryArchSuffix
 	lib:libpcre$secondaryArchSuffix
@@ -55,13 +68,16 @@ REQUIRES="
 #	lib:libQt5Widgets$secondaryArchSuffix
 	lib:libreadline$secondaryArchSuffix
 	lib:libsndfile$secondaryArchSuffix
+	lib:libsuitesparseconfig$secondaryArchSuffix
+	lib:libsundials_ida$secondaryArchSuffix
+	lib:libumfpack$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
 	octave${secondaryArchSuffix}_devel = $portVersion
-	devel:liboctave$secondaryArchSuffix = $portVersion
-	devel:liboctinterp$secondaryArchSuffix = $portVersion
+	devel:liboctave$secondaryArchSuffix = $liboctaveVersionCompat
+	devel:liboctinterp$secondaryArchSuffix = $liboctinterpVersionCompat
 	"
 REQUIRES_devel="
 	octave$secondaryArchSuffix == $portVersion base
@@ -69,9 +85,16 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	devel:libamd$secondaryArchSuffix
+	devel:libarpack$secondaryArchSuffix
 	devel:libbz2$secondaryArchSuffix
+	devel:libcamd$secondaryArchSuffix
+	devel:libccolamd$secondaryArchSuffix
+	devel:libcholmod$secondaryArchSuffix
+	devel:libcolamd$secondaryArchSuffix
 	devel:libcrypto$secondaryArchSuffix
 	devel:libcurl$secondaryArchSuffix
+	devel:libcxsparse$secondaryArchSuffix
 	devel:libfftw3$secondaryArchSuffix
 	devel:libfontconfig$secondaryArchSuffix
 	devel:libfreetype$secondaryArchSuffix
@@ -80,9 +103,11 @@ BUILD_REQUIRES="
 	devel:libGLU$secondaryArchSuffix
 	devel:libgomp$secondaryArchSuffix
 #	devel:libgraphicsmagick$secondaryArchSuffix
-#	devel:libhdf5$secondaryArchSuffix
-#	devel:liblapack$secondaryArchSuffix
-#	devel:libmagick++_6.q16$secondaryArchSuffix
+	devel:libhdf5$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
+	devel:libklu$secondaryArchSuffix
+	devel:liblapack$secondaryArchSuffix
+	devel:libmagick++_6.q16$secondaryArchSuffix
 	devel:libncursesw$secondaryArchSuffix
 	devel:libopenblas$secondaryArchSuffix
 	devel:libpcre$secondaryArchSuffix
@@ -94,32 +119,46 @@ BUILD_REQUIRES="
 #	devel:libQt5Widgets$secondaryArchSuffix
 	devel:libreadline$secondaryArchSuffix
 	devel:libsndfile$secondaryArchSuffix
+	devel:libsuitesparseconfig$secondaryArchSuffix
+	devel:libsundials_ida$secondaryArchSuffix
+	devel:libumfpack$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	cmd:autoconf
 	cmd:awk
 	cmd:bison >= 3
 	cmd:find
-#	cmd:flex
+	cmd:flex
 	cmd:g++$secondaryArchSuffix
 	cmd:gfortran$secondaryArchSuffix
-	cmd:gnuplot$secondaryArchSuffix
-#	cmd:gperf
+	cmd:gnuplot
+	cmd:gperf
 	cmd:grep
 	cmd:gs
 	cmd:less
 	cmd:libtoolize$secondaryArchSuffix
+#	cmd:lrelease$secondaryArchSuffix >=5 # Qt
 	cmd:make
-#	cmd:makeinfo
+	cmd:makeinfo
 	cmd:perl
 	cmd:pkg_config$secondaryArchSuffix
-#	cmd:python
+	cmd:python3
+#	cmd:qcollectiongenerator$secondaryArchSuffix >=5 # Qt
+#	cmd:qhelpgenerator$secondaryArchSuffix >=5 # Qt
 #	cmd:rsvg_convert
 	cmd:sed
 	"
 
 BUILD()
 {
+	# Avoid using rsvg-convert and icotool, which we don't have
+	# and it doesn't make any sense to create those icons
+	rm -rf etc/icons/octave-logo-*.png
+	rm -rf octave-logo.ico
+	touch etc/icons/octave-logo-{16,22,24,32,48,64,128,256,512}.png
+	touch etc/icons/octave-logo.ico
+
 	export LDFLAGS="-lnetwork"
 
 	runConfigure ./configure \
@@ -152,7 +191,7 @@ INSTALL()
 	done
 
 	# Remove unnecessary stuff
-	for f in appdata icons; do
+	for f in appdata applications icons; do
 		rm -rf $dataDir/$f
 	done
 
@@ -160,6 +199,8 @@ INSTALL()
 		liboctave \
 		liboctinterp
 
+	fixPkgconfig
+
 	# devel package
 	packageEntries devel \
 		$developDir
diff --git a/sci-mathematics/octave/patches/octave-4.2.1.patchset b/sci-mathematics/octave/patches/octave-5.1.0.patchset
similarity index 100%
rename from sci-mathematics/octave/patches/octave-4.2.1.patchset
rename to sci-mathematics/octave/patches/octave-5.1.0.patchset