diff --git a/astro/indiwebmanagerapp/Makefile b/astro/indiwebmanagerapp/Makefile
index 56539e012cd8..4760004ba181 100644
--- a/astro/indiwebmanagerapp/Makefile
+++ b/astro/indiwebmanagerapp/Makefile
@@ -1,30 +1,29 @@
 PORTNAME=	indiwebmanagerapp
-DISTVERSION=	1.6
-PORTREVISION=	2
+DISTVERSION=	1.8
 CATEGORIES=	astro
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Graphical program to manage an INDI WebManager
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	indiserver:devel/indi \
 		${PYTHON_PKGNAMEPREFIX}indiweb>0:astro/py-indiweb@${PY_FLAVOR}
 
 USES=		cmake iconv gettext kde:5 ninja qt:5 pkgconfig python:3.5+
 USE_KDE=	auth bookmarks codecs completion config configwidgets \
 		coreaddons doctools i18n kio itemviews jobwidgets service \
 		solid widgetsaddons windowsystem xmlgui
 USE_QT=		buildtools concurrent core dbus gui qmake_build network widgets \
 		xml
 USE_GITHUB=	yes
 GH_ACCOUNT=	rlancaste
 GH_PROJECT=	INDIWebManagerApp
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' -e \
 		's|python3|${PYTHON_VERSION}|g' ${WRKSRC}/src/mainwindow.cpp
 	${REINPLACE_CMD} -e 's|On Linux|On Linux\/FreeBSD|g' \
 		${WRKSRC}/src/opsconfiguration.cpp
 
 .include <bsd.port.mk>
diff --git a/astro/indiwebmanagerapp/distinfo b/astro/indiwebmanagerapp/distinfo
index 19dd6a73af4a..21dbd00b628a 100644
--- a/astro/indiwebmanagerapp/distinfo
+++ b/astro/indiwebmanagerapp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1621750232
-SHA256 (rlancaste-INDIWebManagerApp-1.6_GH0.tar.gz) = 8bb0d62f6e208381a89997989105253eef8db692fb1d105fcaf5f70dd63a8cb2
-SIZE (rlancaste-INDIWebManagerApp-1.6_GH0.tar.gz) = 1474857
+TIMESTAMP = 1653200554
+SHA256 (rlancaste-INDIWebManagerApp-1.8_GH0.tar.gz) = ddcf1626f3e4bc44cb0fecfa7af0ef0cc68a48a176b40cc80ba488a3e6d1464a
+SIZE (rlancaste-INDIWebManagerApp-1.8_GH0.tar.gz) = 1474843
diff --git a/astro/indiwebmanagerapp/files/patch-src_mainwindow.cpp b/astro/indiwebmanagerapp/files/patch-src_mainwindow.cpp
index 8120cbb74158..5991820bcde4 100644
--- a/astro/indiwebmanagerapp/files/patch-src_mainwindow.cpp
+++ b/astro/indiwebmanagerapp/files/patch-src_mainwindow.cpp
@@ -1,55 +1,64 @@
---- src/mainwindow.cpp	2021-09-04 23:55:40.427687000 -0500
-+++ src/mainwindow.cpp	2021-09-05 00:10:09.774435000 -0500
+--- src/mainwindow.cpp	2022-05-22 01:43:45.247103000 -0500
++++ src/mainwindow.cpp	2022-05-22 01:50:16.014480000 -0500
 @@ -295,6 +295,8 @@
      #ifdef Q_OS_OSX
          //Note this is the Path where python3 gets symlinked by homebrew.
          return "/usr/local/opt/python/libexec/bin";
 +    #elif defined(Q_OS_FREEBSD)
 +        return "%%LOCALBASE%%/bin";
      #endif
          if (flat.isEmpty() == false)
              return flat + "/bin/";
 @@ -307,6 +309,8 @@
      {
      #ifdef Q_OS_OSX
          return "/usr/local/bin/indi-web";
 +    #elif defined(Q_OS_FREEBSD)
 +        return "%%LOCALBASE%%/bin/indi-web";
      #endif
          return QDir::homePath() + "/.local/bin/indi-web";
      }
 @@ -316,6 +320,8 @@
      {
      #ifdef Q_OS_OSX
          return QStandardPaths::locate(QStandardPaths::GenericDataLocation, QString(), QStandardPaths::LocateDirectory) + "INDIWebManagerApp/gsc";
 +    #elif defined(Q_OS_FREEBSD)
 +        return "%%LOCALBASE%%/share/gsc";
      #endif
          if (flat.isEmpty() == false)
              return flat + "/share/GSC";
-@@ -339,6 +345,8 @@
+@@ -329,6 +335,8 @@
      #ifdef Q_OS_OSX
          QString appPath = QCoreApplication::applicationDirPath();
-         return QDir(appPath + "/indi").absolutePath();
+         return QDir(appPath + "/../../").absolutePath();
++    #elif defined(Q_OS_FREEBSD)
++        return "%%LOCALBASE%%/bin/";
+     #endif
+         return "";
+     }
+@@ -338,6 +346,8 @@
+     {
+     #ifdef Q_OS_OSX
+         return QDir(QCoreApplication::applicationDirPath()).absolutePath();
 +    #elif defined(Q_OS_FREEBSD)
 +        return "%%LOCALBASE%%/bin/";
      #endif
          if (flat.isEmpty() == false)
              return flat + "/bin/";
-@@ -352,6 +360,8 @@
+@@ -351,6 +361,8 @@
      #ifdef Q_OS_OSX
          QString appPath = QCoreApplication::applicationDirPath();
          return QDir(appPath + "/../Resources/DriverSupport").absolutePath();
 +    #elif defined(Q_OS_FREEBSD)
 +        return "%%LOCALBASE%%/share/indi";
      #elif defined(Q_OS_LINUX)
          if (flat.isEmpty() == false)
              return flat + "/share/indi";
-@@ -544,7 +554,6 @@
+@@ -543,7 +555,6 @@
   */
  bool MainWindow::pythonInstalled(QString pythonExecFolder)
  {
 -
      return QFileInfo(pythonExecFolder + "/python").exists() || QFileInfo(pythonExecFolder + "/python2").exists() || QFileInfo(pythonExecFolder + "/python3").exists();
  }