diff --git a/sci-mathematics/octave/octave-7.1.0.recipe b/sci-mathematics/octave/octave-7.1.0.recipe
index 370e3f5f4..d37eddf32 100644
--- a/sci-mathematics/octave/octave-7.1.0.recipe
+++ b/sci-mathematics/octave/octave-7.1.0.recipe
@@ -5,7 +5,7 @@ for solving linear and nonlinear problems numerically."
 HOMEPAGE="http://www.octave.org/"
 COPYRIGHT="1996-2022 John W. Eaton"
 LICENSE="GNU GPL v3"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://ftp.gnu.org/gnu/octave/octave-$portVersion.tar.gz"
 CHECKSUM_SHA256="d4a9d81f3f67b4a6e07cb7a80dcb10ad5e9176fcc30762c70a81580a64b8b0b6"
 PATCHES="octave-$portVersion.patchset"
@@ -174,11 +174,11 @@ BUILD()
 	export LDFLAGS="-lnetwork -lbsd"
 
 	runConfigure ./configure \
+		--libexecdir=$libDir \
 		--disable-docs \
 		--without-x
 
-	# $jobArgs uses too much RAM
-	make
+	make $jobArgs
 }
 
 INSTALL()
@@ -225,15 +225,15 @@ INSTALL()
 	addResourcesToBinaries octave.rdef $binDir/octave-gui
 	mimeset -f $binDir/octave-gui
 	
-	# Add Octave-GUI to Deskbar
-	mkdir -p $dataDir/deskbar/menu/Applications
-	cat > $dataDir/deskbar/menu/Applications/Octave << EOF
+	mkdir -p $appsDir
+	cat > $appsDir/Octave << EOF
 #!/bin/sh
 $binDir/octave-gui --gui --experimental-terminal-widget
 EOF
-	chmod +x $dataDir/deskbar/menu/Applications/Octave
-	copyattr -n "BEOS:ICON" $binDir/octave-gui $dataDir/deskbar/menu/Applications/Octave
-	mimeset -f $dataDir/deskbar/menu/Applications/Octave
+	chmod +x $appsDir/Octave
+	copyattr -n "BEOS:ICON" $binDir/octave-gui $appsDir/Octave
+	mimeset -f $appsDir/Octave
+	addAppDeskbarSymlink $appsDir/Octave
 
 	prepareInstalledDevelLibs \
 		liboctave \
diff --git a/sci-mathematics/octave/patches/octave-7.1.0.patchset b/sci-mathematics/octave/patches/octave-7.1.0.patchset
index 555b78e79..09ca06f50 100644
--- a/sci-mathematics/octave/patches/octave-7.1.0.patchset
+++ b/sci-mathematics/octave/patches/octave-7.1.0.patchset
@@ -1,4 +1,4 @@
-From c977a6a3d6377a2eb72f16c62c3230a5133e4e00 Mon Sep 17 00:00:00 2001
+From 9927db23bd64572f23ee309aae6e0edf8aaa5a30 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
 Date: Sun, 26 Mar 2017 19:42:22 +0200
 Subject: rusage Haiku patch
@@ -43,7 +43,7 @@ index a22cd2e..b430281 100644
 2.36.1
 
 
-From 1f809f17c5d3795d6bdd685135d8bae8615c62f7 Mon Sep 17 00:00:00 2001
+From b78ff69da5586f47ce5413a99b90fb9988db26b4 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Tue, 24 May 2022 21:46:17 +1000
 Subject: Disable adjust figure position
@@ -65,3 +65,39 @@ index 3fa56a0..22eba33 100644
 -- 
 2.36.1
 
+
+From 3099a7b216c964324c5fa781e4b5786cd11ddc97 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Wed, 25 May 2022 11:10:42 +1000
+Subject: Use Noto Sans Mono by Default
+
+
+diff --git a/libgui/src/gui-preferences-global.h b/libgui/src/gui-preferences-global.h
+index 34ab815..c6165e9 100644
+--- a/libgui/src/gui-preferences-global.h
++++ b/libgui/src/gui-preferences-global.h
+@@ -39,6 +39,8 @@ const QString gui_obj_name_main_window = "MainWindow";
+ const QString global_font_family = "Courier";
+ #elif defined (Q_OS_MAC)
+ const QString global_font_family = "Monaco";
++#elif defined (Q_OS_HAIKU)
++const QString global_font_family = "Noto Sans Mono";
+ #else
+ const QString global_font_family = "Monospace";
+ #endif
+diff --git a/libgui/src/resource-manager.cc b/libgui/src/resource-manager.cc
+index b0bbafa..29b4d6f 100644
+--- a/libgui/src/resource-manager.cc
++++ b/libgui/src/resource-manager.cc
+@@ -217,7 +217,7 @@ namespace octave
+     for (int index = 0; index < font_combo_box.count(); index++)
+       fonts << font_combo_box.itemText(index);
+ 
+-#if defined (Q_OS_MAC)
++#if defined (Q_OS_MAC) || defined(Q_OS_HAIKU)
+     // Use hard coded default on macOS, since selection of fixed width
+     // default font is unreliable (see bug #59128).
+     // Test for macOS default fixed width font
+-- 
+2.36.1
+