diff --git a/sysutils/mmc-utils/Makefile b/sysutils/mmc-utils/Makefile
index 031e7befa88d..b840ebfa181a 100644
--- a/sysutils/mmc-utils/Makefile
+++ b/sysutils/mmc-utils/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	mmc-utils
-DISTVERSION=	20230209
+DISTVERSION=	20230612
 DISTVERSIONSUFFIX=	-${MMC_GITSHASH}
 CATEGORIES=	sysutils
 MASTER_SITES=	https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/snapshot/${MMC_GITHASH}${EXTRACT_SUFX}?dummy=/
 
 MAINTAINER=	marius@FreeBSD.org
 COMMENT=	Userspace tools for MMC/SD devices
 WWW=		https://www.kernel.org/doc/html/latest/driver-api/mmc/mmc-tools.html
 
 LICENSE=	BSD3CLAUSE GPLv2
 LICENSE_COMB=	multi
 
 IGNORE_DragonFly=	only supported on FreeBSD
-MMC_GITHASH=	d4c2910981ff99b983734426dfa99632fb81ac6b
+CFLAGS+=	-DVERSION='\"${MMC_GITSHASH}\"'
+MMC_GITHASH=	6d593efc3cd00e4debd0ffc5806246390dc66242
 MMC_GITSHASH=	${MMC_GITHASH:C/^(........).*/\1/}
 PLIST_FILES=	man/man1/mmc.1.gz sbin/mmc
 USES=		gmake
 WRKSRC=		${WRKDIR}/${MMC_GITHASH}
 
 post-patch:
 .for i in Makefile mmc_cmds.c mmc.c man/mmc.1
-	@${REINPLACE_CMD} -e 's|^AM_CFLAGS|#^|; s|path/to|dev|g;\
-		s|mmcblk|mmcsd|g' ${WRKSRC}/${i}
+	@${REINPLACE_CMD} -Ee 's|^(override CFLAGS.*)\$$\(AM_CFLAGS\) |\1|; \
+		s|path/to|dev|g; s|mmcblk|mmcsd|g' ${WRKSRC}/${i}
 .endfor
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mmc ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_MAN} ${WRKSRC}/man/mmc.1 ${STAGEDIR}${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/sysutils/mmc-utils/distinfo b/sysutils/mmc-utils/distinfo
index f98908a6048e..bd8bf27c8961 100644
--- a/sysutils/mmc-utils/distinfo
+++ b/sysutils/mmc-utils/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1676241599
-SHA256 (mmc-utils-20230209-d4c29109.tar.gz) = ba1414aaa31d87f0c37b6a8ddf6da67af4776a2e6b05c165d4d6d53294c7a628
-SIZE (mmc-utils-20230209-d4c29109.tar.gz) = 50506
+TIMESTAMP = 1689355687
+SHA256 (mmc-utils-20230612-6d593efc.tar.gz) = 9f1088b316762d10b3785ed84f1fbc075d63a3c3d0d72e4effb569e87d2cac34
+SIZE (mmc-utils-20230612-6d593efc.tar.gz) = 50537