diff --git a/MOVED b/MOVED
--- a/MOVED
+++ b/MOVED
@@ -3721,3 +3721,5 @@
 sysutils/ztop|filesystems/ztop|2024-11-13|Moved to new category filesystems
 devel/b2|devel/py-b2|2024-11-14|Add py- prefix
 misc/morse||2024-11-14|Project discontinued upstream
+devel/py-gobject3|devel/py-pygobject|2024-11-16|Use proper upstream package name
+devel/pygobject3-common|devel/pygobject-common|2024-11-16|Match devel/py-pygobject, use proper upstream name
diff --git a/Mk/Uses/gnome.mk b/Mk/Uses/gnome.mk
--- a/Mk/Uses/gnome.mk
+++ b/Mk/Uses/gnome.mk
@@ -277,8 +277,8 @@
 libgsf_LIB_DEPENDS=	libgsf-1.so:devel/libgsf
 libgsf_USE_GNOME_IMPL=	glib20 libxml2
 
-pygobject3_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR}
-pygobject3_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR}
+pygobject3_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygobject>=0:devel/py-pygobject@${PY_FLAVOR}
+pygobject3_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}pygobject>=0:devel/py-pygobject@${PY_FLAVOR}
 pygobject3_USE_GNOME_IMPL=	glib20
 
 intltool_BUILD_DEPENDS=	${LOCALBASE}/bin/intltool-extract:textproc/intltool
diff --git a/devel/Makefile b/devel/Makefile
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -4920,7 +4920,6 @@
     SUBDIR += py-glance-store
     SUBDIR += py-glob2
     SUBDIR += py-glom
-    SUBDIR += py-gobject3
     SUBDIR += py-google-cloud-iam
     SUBDIR += py-google-crc32c
     SUBDIR += py-google-i18n-address
@@ -5532,6 +5531,7 @@
     SUBDIR += py-pygdbmi
     SUBDIR += py-pygit2
     SUBDIR += py-pygls
+    SUBDIR += py-pygobject
     SUBDIR += py-pygpx
     SUBDIR += py-pyhashxx
     SUBDIR += py-pyhcl
@@ -6209,7 +6209,7 @@
     SUBDIR += pydeps
     SUBDIR += pyderasn
     SUBDIR += pyenv
-    SUBDIR += pygobject3-common
+    SUBDIR += pygobject-common
     SUBDIR += pylint
     SUBDIR += pylyzer
     SUBDIR += pymsteams
diff --git a/devel/py-gobject3/Makefile b/devel/py-gobject3/Makefile
deleted file mode 100644
--- a/devel/py-gobject3/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-PKGNAMESUFFIX=	3
-
-COMMENT=	Python ${PYTHON_VER} bindings for GObject
-
-SLAVE_PORT=	python
-
-MASTERDIR=	${.CURDIR}/../../devel/pygobject3-common
-PLIST=		${.CURDIR}/pkg-plist
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/py-gobject3/pkg-plist b/devel/py-gobject3/pkg-plist
deleted file mode 100644
--- a/devel/py-gobject3/pkg-plist
+++ /dev/null
@@ -1,84 +0,0 @@
-%%PYTHON_SITELIBDIR%%/PyGObject-%%VERSION%%.egg-info
-%%PYTHON_SITELIBDIR%%/gi/__init__.py
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/_constants.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/_constants.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/_error.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/_error.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/_gtktemplate.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/_gtktemplate.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/_option.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/_option.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/_ossighelper.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/_ossighelper.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/_propertyhelper.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/_propertyhelper.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/_signalhelper.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/_signalhelper.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/docstring.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/docstring.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/importer.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/importer.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/module.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/module.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/pygtkcompat.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/pygtkcompat.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/types.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/gi/__pycache__/types.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/_constants.py
-%%PYTHON_SITELIBDIR%%/gi/_error.py
-%%PYTHON_SITELIBDIR%%/gi/_gi%%PYTHON_EXT_SUFFIX%%.so
-%%PYTHON_SITELIBDIR%%/gi/_gi_cairo%%PYTHON_EXT_SUFFIX%%.so
-%%PYTHON_SITELIBDIR%%/gi/_gtktemplate.py
-%%PYTHON_SITELIBDIR%%/gi/_option.py
-%%PYTHON_SITELIBDIR%%/gi/_ossighelper.py
-%%PYTHON_SITELIBDIR%%/gi/_propertyhelper.py
-%%PYTHON_SITELIBDIR%%/gi/_signalhelper.py
-%%PYTHON_SITELIBDIR%%/gi/docstring.py
-%%PYTHON_SITELIBDIR%%/gi/importer.py
-%%PYTHON_SITELIBDIR%%/gi/module.py
-%%PYTHON_SITELIBDIR%%/gi/overrides/GIMarshallingTests.py
-%%PYTHON_SITELIBDIR%%/gi/overrides/GLib.py
-%%PYTHON_SITELIBDIR%%/gi/overrides/GObject.py
-%%PYTHON_SITELIBDIR%%/gi/overrides/Gdk.py
-%%PYTHON_SITELIBDIR%%/gi/overrides/GdkPixbuf.py
-%%PYTHON_SITELIBDIR%%/gi/overrides/Gio.py
-%%PYTHON_SITELIBDIR%%/gi/overrides/Gtk.py
-%%PYTHON_SITELIBDIR%%/gi/overrides/Pango.py
-%%PYTHON_SITELIBDIR%%/gi/overrides/__init__.py
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GIMarshallingTests.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GIMarshallingTests.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GLib.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GLib.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GObject.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GObject.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gdk.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gdk.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GdkPixbuf.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GdkPixbuf.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gio.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gio.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gtk.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gtk.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Pango.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Pango.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/keysyms.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/keysyms.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/keysyms.py
-%%PYTHON_SITELIBDIR%%/gi/pygtkcompat.py
-%%PYTHON_SITELIBDIR%%/gi/repository/__init__.py
-%%PYTHON_SITELIBDIR%%/gi/repository/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/gi/repository/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/gi/types.py
-%%PYTHON_SITELIBDIR%%/pygtkcompat/__init__.py
-%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/generictreemodel.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/generictreemodel.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/pygtkcompat.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/pygtkcompat.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/pygtkcompat/generictreemodel.py
-%%PYTHON_SITELIBDIR%%/pygtkcompat/pygtkcompat.py
diff --git a/devel/py-pygobject/Makefile b/devel/py-pygobject/Makefile
new file mode 100644
--- /dev/null
+++ b/devel/py-pygobject/Makefile
@@ -0,0 +1,44 @@
+PORTNAME=	pygobject
+DISTVERSION=	3.50.0
+PORTREVISION?=	0
+CATEGORIES=	devel python
+MASTER_SITES=	GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+PKGNAMEPREFIX?=	${PYTHON_PKGNAMEPREFIX}
+DIST_SUBDIR=	gnome
+
+MAINTAINER=	desktop@FreeBSD.org
+COMMENT?=	Python bindings for GObject Introspection
+WWW=		https://pygobject.gnome.org/
+
+LICENSE=	LGPL21
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairo>=1.16:graphics/py-cairo@${PY_FLAVOR}
+LIB_DEPENDS=	libffi.so:devel/libffi
+
+USES=		gnome pkgconfig python:3.9+ tar:xz
+
+BINARY_ALIAS=	python3=${PYTHON_CMD}
+PORTSCOUT=	limitw:1,even
+
+SLAVE_PORT?=	no
+
+.if ${SLAVE_PORT} == common
+USES+=		meson
+USE_GNOME=	glib20:build introspection:build
+
+do-install:
+	${INSTALL_DATA} ${WRKSRC}/_build/pygobject-3.0.pc \
+		${STAGEDIR}${PREFIX}/libdata/pkgconfig/pygobject-3.0.pc
+	@${MKDIR} ${STAGEDIR}${PREFIX}/include/pygobject-3.0
+	${INSTALL_DATA} ${WRKSRC}/gi/pygobject.h \
+		${STAGEDIR}${PREFIX}/include/pygobject-3.0/pygobject.h
+.else
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}meson-python>=0.12.1:devel/meson-python@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairo>=1.16:graphics/py-cairo@${PY_FLAVOR} \
+		${LOCALBASE}/libdata/pkgconfig/pygobject-3.0.pc:devel/pygobject-common
+USE_GNOME=	cairo glib20 introspection
+USE_PYTHON=	autoplist concurrent pep517
+.endif
+
+.include <bsd.port.mk>
diff --git a/devel/py-pygobject/distinfo b/devel/py-pygobject/distinfo
new file mode 100644
--- /dev/null
+++ b/devel/py-pygobject/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1728481705
+SHA256 (gnome/pygobject-3.50.0.tar.xz) = 8d836e75b5a881d457ee1622cae4a32bcdba28a0ba562193adb3bbb472472212
+SIZE (gnome/pygobject-3.50.0.tar.xz) = 929848
diff --git a/devel/pygobject3-common/pkg-descr b/devel/py-pygobject/pkg-descr
rename from devel/pygobject3-common/pkg-descr
rename to devel/py-pygobject/pkg-descr
diff --git a/devel/pygobject-common/Makefile b/devel/pygobject-common/Makefile
new file mode 100644
--- /dev/null
+++ b/devel/pygobject-common/Makefile
@@ -0,0 +1,15 @@
+PKGNAMEPREFIX=
+PKGNAMESUFFIX=	-common
+
+COMMENT=	Common files for Python bindings for GObject Introspection
+
+NO_BUILD=	yes
+NO_ARCH=	yes
+PLIST_FILES=	include/pygobject-3.0/pygobject.h \
+		libdata/pkgconfig/pygobject-3.0.pc
+
+SLAVE_PORT=	common
+
+MASTERDIR=	${.CURDIR}/../../devel/py-pygobject
+
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/pygobject3-common/Makefile b/devel/pygobject3-common/Makefile
deleted file mode 100644
--- a/devel/pygobject3-common/Makefile
+++ /dev/null
@@ -1,76 +0,0 @@
-PORTNAME=	gobject
-PORTVERSION=	3.42.2
-CATEGORIES=	devel python
-MASTER_SITES=	GNOME/sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-PKGNAMEPREFIX?=	py
-PKGNAMESUFFIX?=	3-common
-DISTNAME=	pygobject-${PORTVERSION}
-DIST_SUBDIR=	gnome
-
-MAINTAINER=	desktop@FreeBSD.org
-COMMENT?=	Common files for the Python bindings for GObject
-
-LICENSE=	LGPL21
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR}
-
-SLAVE_PORT?=	no
-
-USES=		meson pkgconfig tar:xz
-
-# this port doesn't work with py-gobject < 2.28.6_2, clungle below
-CONFLICTS=	py*-gtk-0* py*-gobject-2.*.[0-6] py*-gobject-2.*.[7-9] \
-		py*-gobject-2.*.6_1
-
-PLIST_SUB=	ARCH=${ARCH} UNAME_R=${UNAME_R} VERSION=${PORTVERSION} \
-		OPSYS=${OPSYS:tl} UNAME_M=${UNAME_M}
-
-BINARY_ALIAS=	python3=${PYTHON_CMD}
-
-TESTING_UNSAFE=	AttributeError: 'NoneType' object has no attribute '_version'
-
-.if ${SLAVE_PORT} == no
-PORTSCOUT?=	limitw:1,even
-
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR}
-USES+=		gnome python:build
-USE_GNOME=	glib20:build introspection:build
-NO_ARCH=	yes
-NO_BUILD=	yes
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/include/pygobject-3.0/
-	${INSTALL_DATA} ${WRKSRC}/gi/pygobject.h \
-		${STAGEDIR}${PREFIX}/include/pygobject-3.0/pygobject.h
-	${INSTALL_DATA} ${WRKSRC}/_build/pygobject-3.0.pc \
-		${STAGEDIR}${PREFIX}/libdata/pkgconfig/pygobject-3.0.pc
-.else
-PORTSCOUT=	ignore:1
-
-USES+=		gettext-runtime gnome
-USE_GNOME+=	cairo glib20 introspection
-LIB_DEPENDS+=	libffi.so:devel/libffi
-RUN_DEPENDS+=	pygobject3-common>=0:devel/pygobject3-common
-
-.  if ${SLAVE_PORT} == python
-USES+=		python
-USE_PYTHON=	flavors py3kplist
-MESON_ARGS+=	-Dpython=${PYTHON_VERSION}
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR}
-.  endif
-
-post-install:
-	@${RM} -r ${STAGEDIR}${PREFIX}/include/pygobject-3.0 \
-		${STAGEDIR}${PREFIX}/libdata/pkgconfig/pygobject-3.0.pc
-	${PYTHON_CMD} -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
-	${PYTHON_CMD} -O -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
-.endif
-
-.include <bsd.port.pre.mk>
-
-UNAME_R!=	${UNAME} -r
-UNAME_M!=	${UNAME} -m
-
-.include <bsd.port.post.mk>
diff --git a/devel/pygobject3-common/distinfo b/devel/pygobject3-common/distinfo
deleted file mode 100644
--- a/devel/pygobject3-common/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1658710769
-SHA256 (gnome/pygobject-3.42.2.tar.xz) = ade8695e2a7073849dd0316d31d8728e15e1e0bc71d9ff6d1c09e86be52bc957
-SIZE (gnome/pygobject-3.42.2.tar.xz) = 558724
diff --git a/devel/pygobject3-common/pkg-plist b/devel/pygobject3-common/pkg-plist
deleted file mode 100644
--- a/devel/pygobject3-common/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-include/pygobject-3.0/pygobject.h
-libdata/pkgconfig/pygobject-3.0.pc