diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 8b73bd6dd1ae..8e78b763bcce 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -1,78 +1,78 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 
 PORTNAME=	gnome-control-center
 PORTVERSION=	42.0
 PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Control center for GNOME 3 project
+COMMENT=	Control center for the GNOME desktop
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	gnome-settings-daemon>=3.4.0:sysutils/gnome-settings-daemon \
 		gsettings-desktop-schemas>=3.2.2:devel/gsettings-desktop-schemas # #		docbook-xsl>=0:textproc/docbook-xsl
 LIB_DEPENDS=	libaccountsservice.so:sysutils/accountsservice \
 		libadwaita-1.so:x11-toolkits/libadwaita \
 		libcanberra-gtk3.so:audio/libcanberra-gtk3 \
 		libcanberra.so:audio/libcanberra \
 		libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
 		libcolord-gtk.so:graphics/colord-gtk \
 		libcolord.so:graphics/colord \
 		libcups.so:print/cups \
 		libepoxy.so:graphics/libepoxy \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libgoa-1.0.so:net/gnome-online-accounts \
 		libgrilo-0.3.so:net/grilo \
 		libgtop-2.0.so:devel/libgtop \
 		libhandy-1.so:x11-toolkits/libhandy \
 		libibus-1.0.so:textproc/ibus \
 		libpolkit-gobject-1.so:sysutils/polkit \
 		libpulse.so:audio/pulseaudio \
 		libpwquality.so:security/libpwquality \
 		libsecret-1.so:security/libsecret \
 		libsoup-2.4.so:devel/libsoup \
 		libudisks2.so:sysutils/libudisks \
 		libupower-glib.so:sysutils/upower
 RUN_DEPENDS=	cantarell-fonts>=0:x11-fonts/cantarell-fonts \
 		gcm-import:graphics/gnome-color-manager \
 		gnome-settings-daemon>=3.4.0:sysutils/gnome-settings-daemon \
 		gsettings-desktop-schemas>=3.2.2:devel/gsettings-desktop-schemas
 
 PORTSCOUT=	limitw:1,even
 
 USES=		compiler:c++11-lib gettext gnome localbase:ldflags meson \
 		pkgconfig python:3.6+,build samba:lib tar:xz xorg
 USE_GNOME=	cairo gnomedesktop3 gsound libxml2
 USE_XORG=	x11 xi
 #USE_GSTREAMER1=	yes
 USE_LDCONFIG=	yes
 BINARY_ALIAS=	python3=${PYTHON_VERSION}
 
 GLIB_SCHEMAS=	org.gnome.Settings.gschema.xml
 
 OPTIONS_SUB=	yes
 
 OPTIONS_DEFINE=		WAYLAND
 OPTIONS_DEFAULT=	WAYLAND
 
 WAYLAND_MESON_TRUE=	wayland
 WAYLAND_LIB_DEPENDS=	libgudev-1.0.so:devel/libgudev
 
 .include <bsd.port.pre.mk>
 
 # FreeBSD base gained an os-release in r354922, but that does not exist
 # always (see Synth bug 191, or PR 255354). Be a little more forgiving:
 # assume sufficiently recent base "will have it", and check otherwise
 # because 12.2 does, others like 12.1 do not have it.
 .if !exists(/etc/rc.d/os-release) && (${OSVERSION} < 1300060)
 RUN_DEPENDS+=	etc_os-release>0:sysutils/etc_os-release
 post-patch:
 	@${REINPLACE_CMD}  -e 's|/etc/os-release|${LOCALBASE}/etc/os-release|g' \
 		${WRKSRC}/panels/common/cc-os-release.c
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/gnome-control-center/files/patch-panels_user-accounts_cc-realm-manager.c b/sysutils/gnome-control-center/files/patch-panels_user-accounts_cc-realm-manager.c
new file mode 100644
index 000000000000..10c223ceb15f
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-panels_user-accounts_cc-realm-manager.c
@@ -0,0 +1,25 @@
+Fix for Heimdal (versus MIT).
+
+Index: panels/user-accounts/cc-realm-manager.c
+--- panels/user-accounts/cc-realm-manager.c.orig
++++ panels/user-accounts/cc-realm-manager.c
+@@ -22,7 +22,7 @@
+ 
+ #include "cc-realm-manager.h"
+ 
+-#include <krb5/krb5.h>
++#include <krb5.h>
+ 
+ #include <glib.h>
+ #include <glib/gi18n.h>
+@@ -637,8 +637,10 @@ login_perform_kinit (krb5_context k5,
+         code = krb5_get_init_creds_opt_alloc (k5, &opts);
+         g_return_val_if_fail (code == 0, code);
+ 
++#ifdef HAVE_KRB5_GET_INIT_CREDS_OPT_SET_OUT_CCACHE
+         code = krb5_get_init_creds_opt_set_out_ccache (k5, opts, ccache);
+         g_return_val_if_fail (code == 0, code);
++#endif
+ 
+         code = krb5_get_init_creds_password (k5, &creds, principal,
+                                              (char *)password,
diff --git a/sysutils/gnome-control-center/pkg-descr b/sysutils/gnome-control-center/pkg-descr
index 98b39195a2b9..0f7f031b28bb 100644
--- a/sysutils/gnome-control-center/pkg-descr
+++ b/sysutils/gnome-control-center/pkg-descr
@@ -1,3 +1,3 @@
-Configuration tools tightly integrated within the GNOME 3 desktop.
+Configuration tools tightly integrated within the GNOME desktop.
 
 WWW: https://www.gnome.org/