diff --git a/science/molsketch/Makefile b/science/molsketch/Makefile
index 36882dc5b57b..c071685b4325 100644
--- a/science/molsketch/Makefile
+++ b/science/molsketch/Makefile
@@ -1,30 +1,32 @@
 PORTNAME=	molsketch
-DISTVERSION=	0.8.1
+DISTVERSION=	0.8.2
 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/
+WWW=		https://molsketch.sourceforge.io/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libopenbabel.so:science/openbabel
 
-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
+USES=		cmake compiler:c++20-lang desktop-file-utils gl localbase:ldflags \
+		pkgconfig qt:6 shared-mime-info # build fails with ninja, see https://sourceforge.net/p/molsketch/bugs/41/
+USE_QT=		base svg tools:build
 USE_LDCONFIG=	${PREFIX}/lib/molsketch
+USE_GL=		gl opengl
 
 CMAKE_ARGS=	-DMSK_PREFIX:STRING=${PREFIX}
+CMAKE_ON=	MSK_QT6
 
 OPTIONS_DEFINE=	DOCS
 
 WRKSRC=		${WRKDIR}/Molsketch-${DISTVERSION}
 
 PORTDOCS=	*
 
 .include <bsd.port.mk>
diff --git a/science/molsketch/distinfo b/science/molsketch/distinfo
index 43a093c33158..5b8402170fc9 100644
--- a/science/molsketch/distinfo
+++ b/science/molsketch/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1737708866
-SHA256 (Molsketch-0.8.1-src.tar.gz) = eb016f977024b6ff11804748d8436c29a9652a5632fdff13b26e42d0507f8a02
-SIZE (Molsketch-0.8.1-src.tar.gz) = 1852967
+TIMESTAMP = 1750672153
+SHA256 (Molsketch-0.8.2-src.tar.gz) = 5a8a18e4eb8e927f5c4bf97eb44ab191f4fa996298123630e8751c0b9e7de5e2
+SIZE (Molsketch-0.8.2-src.tar.gz) = 1855799
diff --git a/science/molsketch/pkg-plist b/science/molsketch/pkg-plist
index fe9d00f0e4db..181e835ac162 100644
--- a/science/molsketch/pkg-plist
+++ b/science/molsketch/pkg-plist
@@ -1,103 +1,105 @@
 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
+include/libmskcore/coreatom.h
+include/libmskcore/corebond.h
+include/libmskcore/coremolecule.h
+include/libmskcore/position.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