diff --git a/science/molsketch/Makefile b/science/molsketch/Makefile
index 86ebc612e5df..36882dc5b57b 100644
--- a/science/molsketch/Makefile
+++ b/science/molsketch/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	molsketch
-DISTVERSION=	0.7.3
+DISTVERSION=	0.8.1
 DISTVERSIONSUFFIX=	-src
 CATEGORIES=	science
 MASTER_SITES=	SF/${PORTNAME}/Molsketch/
 DISTNAME=	Molsketch-${DISTVERSIONFULL}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	2D molecule editor
 WWW=		https://molsketch.sourceforge.net/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libopenbabel.so:science/openbabel
 
-USES=		cmake:noninja compiler:c++14-lang desktop-file-utils localbase:ldflags \
+USES=		cmake:noninja compiler:c++17-lang desktop-file-utils localbase:ldflags \
 		pkgconfig qt:5 shared-mime-info # build fails with ninja, see https://sourceforge.net/p/molsketch/bugs/41/
 USE_QT=		core gui network printsupport svg widgets buildtools:build linguisttools:build qmake:build
 USE_LDCONFIG=	${PREFIX}/lib/molsketch
 
 CMAKE_ARGS=	-DMSK_PREFIX:STRING=${PREFIX}
 
-NO_WRKSUBDIR=	yes
-
 OPTIONS_DEFINE=	DOCS
 
+WRKSRC=		${WRKDIR}/Molsketch-${DISTVERSION}
+
 PORTDOCS=	*
 
 .include <bsd.port.mk>
diff --git a/science/molsketch/distinfo b/science/molsketch/distinfo
index 752188b0df98..43a093c33158 100644
--- a/science/molsketch/distinfo
+++ b/science/molsketch/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1664224961
-SHA256 (Molsketch-0.7.3-src.tar.gz) = 79c8e7c7d00246d7d9da4a11742dba02de3f96e701220709c16772e58178b44d
-SIZE (Molsketch-0.7.3-src.tar.gz) = 1907433
+TIMESTAMP = 1737708866
+SHA256 (Molsketch-0.8.1-src.tar.gz) = eb016f977024b6ff11804748d8436c29a9652a5632fdff13b26e42d0507f8a02
+SIZE (Molsketch-0.8.1-src.tar.gz) = 1852967
diff --git a/science/molsketch/files/patch-CMakeLists.txt b/science/molsketch/files/patch-CMakeLists.txt
index 9aff1b2f1865..240c51f139eb 100644
--- a/science/molsketch/files/patch-CMakeLists.txt
+++ b/science/molsketch/files/patch-CMakeLists.txt
@@ -1,20 +1,11 @@
---- CMakeLists.txt.orig	2021-03-07 18:40:16 UTC
+--- CMakeLists.txt.orig	2024-02-25 11:23:17 UTC
 +++ CMakeLists.txt
-@@ -36,7 +36,7 @@ configure_file("${CMAKE_SOURCE_DIR}/cmake_uninstall.cm
- add_custom_target(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+@@ -119,7 +119,7 @@ add_definitions(-DOBABEL_IFACE_LOCATION="${MSK_INSTALL
  
- # Enabling debugging symbols
--set(CMAKE_BUILD_TYPE Debug)
-+#set(CMAKE_BUILD_TYPE Debug)
- 
- # Enabling shared libraries
- set(BUILD_SHARED_LIBS ON)
-@@ -108,7 +108,7 @@ endif(WIN32 OR WIN64)
- 
- add_definitions(-DOBABEL_IFACE_LOCATION="\\\"${MSK_INSTALL_LIBS}/${OBABEL_IFACE_NAME}\\\"")
+ add_definitions(-DOBABEL_IFACE_LOCATION="${MSK_INSTALL_LIBS}/${OBABEL_IFACE_NAME}")
  
 -set(CMAKE_INSTALL_PREFIX ${MSK_PREFIX})
 +#set(CMAKE_INSTALL_PREFIX ${MSK_PREFIX})
  
  ################ Adding subdirs
  add_subdirectory(libmolsketch)
diff --git a/science/molsketch/files/patch-buildvariables b/science/molsketch/files/patch-buildvariables
index ce8d1cc1f811..dc8502e4355a 100644
--- a/science/molsketch/files/patch-buildvariables
+++ b/science/molsketch/files/patch-buildvariables
@@ -1,10 +1,10 @@
---- buildvariables.orig	2018-10-24 03:59:40 UTC
+--- buildvariables.orig	2023-04-14 16:04:22 UTC
 +++ buildvariables
-@@ -2,6 +2,6 @@
+@@ -1,6 +1,6 @@
+ "Global prefix";MSK_PREFIX;/usr;"C:/Program\ Files/MolsKetch"
  "Executable destination dir";MSK_INSTALL_BINS;/bin;/bin
  "Headers destination dir";MSK_INSTALL_INCLUDES;/include;/include
- "Documentation destination dir";MSK_INSTALL_DOCS;/share/doc/molsketch;/doc
 -"Libraries (64bit) destination dir";MSK_INSTALL_LIBS64;/lib64/molsketch;/lib
 +"Libraries (64bit) destination dir";MSK_INSTALL_LIBS64;/lib/molsketch;/lib
  "Libraries (32bit) destination dir";MSK_INSTALL_LIBS;/lib/molsketch;/lib
  "Build OpenBabel interface";MSK_OBABELIFACE;true;true
diff --git a/science/molsketch/pkg-plist b/science/molsketch/pkg-plist
index 9a1f3aeac0a0..fe9d00f0e4db 100644
--- a/science/molsketch/pkg-plist
+++ b/science/molsketch/pkg-plist
@@ -1,90 +1,103 @@
 bin/molsketch
 include/libmolsketch/TextInputItem.h
 include/libmolsketch/abstractxmlobject.h
 include/libmolsketch/actions/abstractitemaction.h
 include/libmolsketch/actions/abstractrecursiveitemaction.h
 include/libmolsketch/actions/alignmentaction.h
 include/libmolsketch/actions/arrowtypeaction.h
 include/libmolsketch/actions/arrowtypewidget.h
 include/libmolsketch/actions/bondtypeaction.h
 include/libmolsketch/actions/bondtypewidget.h
 include/libmolsketch/actions/coloraction.h
 include/libmolsketch/actions/deleteaction.h
 include/libmolsketch/actions/drawaction.h
 include/libmolsketch/actions/flipbondaction.h
 include/libmolsketch/actions/flipstereobondsaction.h
 include/libmolsketch/actions/frameaction.h
 include/libmolsketch/actions/frametypeaction.h
 include/libmolsketch/actions/frametypewidget.h
 include/libmolsketch/actions/genericaction.h
 include/libmolsketch/actions/incdecaction.h
 include/libmolsketch/actions/itemgrouptypeaction.h
 include/libmolsketch/actions/itemtypeaction.h
 include/libmolsketch/actions/itemtypeselectionaction.h
 include/libmolsketch/actions/itemtypewidget.h
 include/libmolsketch/actions/lineupaction.h
 include/libmolsketch/actions/linewidthaction.h
 include/libmolsketch/actions/mechanismarrowaction.h
 include/libmolsketch/actions/multiaction.h
 include/libmolsketch/actions/periodictablewidget.h
 include/libmolsketch/actions/reactionarrowaction.h
 include/libmolsketch/actions/ringaction.h
 include/libmolsketch/actions/rotateaction.h
 include/libmolsketch/actions/textaction.h
 include/libmolsketch/actions/transformcommand.h
 include/libmolsketch/actions/zlevelaction.h
+include/libmolsketch/alignment.h
 include/libmolsketch/arrow.h
 include/libmolsketch/arrowpopup.h
 include/libmolsketch/atom.h
 include/libmolsketch/atompopup.h
 include/libmolsketch/bond.h
 include/libmolsketch/boundingboxlinker.h
 include/libmolsketch/colorbutton.h
 include/libmolsketch/commands.h
 include/libmolsketch/constants.h
 include/libmolsketch/coordinatedelegate.h
 include/libmolsketch/coordinatemodel.h
 include/libmolsketch/coordinatetableview.h
+include/libmolsketch/core/coreatom.h
+include/libmolsketch/core/corebond.h
+include/libmolsketch/core/coremolecule.h
+include/libmolsketch/debuggable.h
 include/libmolsketch/electronsystem.h
 include/libmolsketch/element.h
 include/libmolsketch/elementalignment.h
 include/libmolsketch/fileio.h
 include/libmolsketch/fontchooser.h
 include/libmolsketch/frame.h
 include/libmolsketch/generics.h
 include/libmolsketch/graphicsitem.h
 include/libmolsketch/grid.h
 include/libmolsketch/helptextemptydock.h
 include/libmolsketch/helptextonemptylabel.h
+include/libmolsketch/iconutils.h
 include/libmolsketch/librarymodel.h
 include/libmolsketch/libraryview.h
 include/libmolsketch/lonepair.h
 include/libmolsketch/math2d.h
 include/libmolsketch/molecule.h
 include/libmolsketch/moleculemodelitem.h
 include/libmolsketch/moleculepopup.h
 include/libmolsketch/molscene.h
 include/libmolsketch/molview.h
 include/libmolsketch/neighboralignment.h
+include/libmolsketch/painting/paintable.h
+include/libmolsketch/painting/paintableaggregate.h
+include/libmolsketch/painting/regulartextbox.h
+include/libmolsketch/painting/stackedtextbox.h
+include/libmolsketch/painting/textbox.h
+include/libmolsketch/painting/textfield.h
+include/libmolsketch/painting/textline.h
 include/libmolsketch/propertiesdock.h
 include/libmolsketch/propertieswidget.h
 include/libmolsketch/qtdeprecations.h
 include/libmolsketch/radicalelectron.h
 include/libmolsketch/scenepropertieswidget.h
 include/libmolsketch/scenesettings.h
 include/libmolsketch/settingsconnector.h
 include/libmolsketch/settingsfacade.h
 include/libmolsketch/settingsitem.h
 include/libmolsketch/stringify.h
 include/libmolsketch/sumformula.h
 include/libmolsketch/textitem.h
 include/libmolsketch/xmlobjectinterface.h
-lib/molsketch/libmolsketch.so
+lib/molsketch/libmskcore.so
 lib/molsketch/libobabeliface.so
 share/applications/molsketch.desktop
 share/icons/hicolor/scalable/apps/molsketch.svg
 share/icons/hicolor/scalable/mimetypes/application-x-molsketch-molecule.svg
 share/icons/hicolor/scalable/mimetypes/application-x-molsketch.svg
 share/metainfo/net.sourceforge.molsketch.appdata.xml
 share/mime/packages/molsketch.xml
 share/pixmaps/molsketch.xpm