diff --git a/cad/qucs-s/Makefile b/cad/qucs-s/Makefile
index 712c8dcdac25..b55be84a0e8c 100644
--- a/cad/qucs-s/Makefile
+++ b/cad/qucs-s/Makefile
@@ -1,34 +1,41 @@
 PORTNAME=	qucs-s
 DISTVERSION=	0.0.24
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Quite Universal Circuit Simulator: GUI for circuit simulation kernels
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	ngspice:cad/ngspice_rework \
-		octave:math/octave
+RUN_DEPENDS=	octave:math/octave
 
 USES=		cmake qt:5
 USE_QT=		core gui printsupport svg widgets buildtools_build linguisttools_build qmake_build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ra3xdh
 GH_PROJECT=	qucs_s
 
 OPTIONS_GROUP=		BACKENDS
-OPTIONS_GROUP_BACKENDS=	XYCE
+OPTIONS_GROUP_BACKENDS=	NGSPICE XYCE QUCSATOR
+OPTIONS_DEFAULT=	NGSPICE
 
-BACKENDS_DESC=		Additional backends (in addition to ngspice)
+BACKENDS_DESC=		Simulation backends
+
+NGSPICE_DESC=		ngspice mixed-signal circuit simulator
+NGSPICE_RUN_DEPENDS=	ngspice:cad/ngspice_rework
 
 XYCE_DESC=		Xyce electronic simulator
-XYCE_RUN_DEPENDS=	Xyce:cad/xyce
+XYCE_RUN_DEPENDS=	Xyce:cad/xyce \
+			mpich>0:net/mpich # mpich for the mpirun executable
+
+QUCSATOR_DESC=		Circuit simulator of the Qucs project
+QUCSATOR_RUN_DEPENDS=	qucsator:cad/qucsator
 
 post-patch:
 	# first the patch under files/ introduces %%PREFIX%%, and now we fix it here
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/qucs/main.cpp
 
 .include <bsd.port.mk>
diff --git a/cad/qucs-s/files/patch-qucs_main.cpp b/cad/qucs-s/files/patch-qucs_main.cpp
index e30cdf8d7d3f..ffe058a7dcb9 100644
--- a/cad/qucs-s/files/patch-qucs_main.cpp
+++ b/cad/qucs-s/files/patch-qucs_main.cpp
@@ -1,21 +1,34 @@
 - this patch works together with post-patch: %%PREFIX%% are substituted there
 
 --- qucs/main.cpp.orig	2022-06-30 18:34:40 UTC
 +++ qucs/main.cpp
+@@ -114,10 +114,10 @@ bool loadSettings()
+         if (QucsSettings.Qucsconv.isEmpty())
+             QucsSettings.Qucsconv = QucsSettings.QucsatorDir + QDir::separator() + "qucsconv" + executableSuffix;
+     } else {
+-        QucsSettings.Qucsator = QucsSettings.BinDir + "qucsator" + executableSuffix;
++        QucsSettings.Qucsator = "%%PREFIX%%/bin/qucsator";
+         QucsSettings.QucsatorDir = QucsSettings.BinDir;
+         if (QucsSettings.Qucsconv.isEmpty())
+-            QucsSettings.Qucsconv = QucsSettings.BinDir + "qucsconv" + executableSuffix;
++            QucsSettings.Qucsconv = "%%PREFIX%%/bin/qucsconv";
+     }
+     //if(settings.contains("BinDir"))QucsSettings.BinDir = settings.value("BinDir").toString();
+     //if(settings.contains("LangDir"))QucsSettings.LangDir = settings.value("LangDir").toString();
 @@ -139,13 +139,13 @@ bool loadSettings()
  #ifdef Q_OS_WIN
          QucsSettings.XyceExecutable = "Xyce.exe";
  #else
 -        QucsSettings.XyceExecutable = "/usr/local/Xyce-Release-6.8.0-OPENSOURCE/bin/Xyce";
 +        QucsSettings.XyceExecutable = "%%PREFIX%%/bin/Xyce";
  #endif
      }
      if(settings.contains("XyceParExecutable")) QucsSettings.XyceParExecutable = settings.value("XyceParExecutable").toString();
 -    else QucsSettings.XyceParExecutable = "mpirun -np %p /usr/local/Xyce-Release-6.8.0-OPENMPI-OPENSOURCE/bin/Xyce";
 +    else QucsSettings.XyceParExecutable = "mpirun -np %p %%PREFIX%%/bin/Xyce";
      if(settings.contains("SpiceOpusExecutable")) QucsSettings.SpiceOpusExecutable = settings.value("SpiceOpusExecutable").toString();
 -    else QucsSettings.SpiceOpusExecutable = "spiceopus";
 +    else QucsSettings.SpiceOpusExecutable = "%%PREFIX%%/bin/spiceopus";
      if(settings.contains("Nprocs")) QucsSettings.NProcs = settings.value("Nprocs").toInt();
      else QucsSettings.NProcs = 4;
      if(settings.contains("S4Q_workdir")) QucsSettings.S4Qworkdir = settings.value("S4Q_workdir").toString();