diff --git a/databases/qof/Makefile b/databases/qof/Makefile
index bcb8fb3c78e8..236315d8e88f 100644
--- a/databases/qof/Makefile
+++ b/databases/qof/Makefile
@@ -1,46 +1,43 @@
 PORTNAME=	qof
-PORTVERSION=	0.8.8
-PORTREVISION=	4
+DISTVERSION=	g20250913
+PORTREVISION=	0
+PORTEPOCH=	1
 CATEGORIES=	databases
-MASTER_SITES=	DEBIAN_POOL
-DISTNAME=	qof_${PORTVERSION}.orig
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	truckman@FreeBSD.org
 COMMENT=	Query Object Framework
-WWW=		https://alioth.debian.org/projects/qof/
+WWW=		https://github.com/GnoTime/qof
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-DEPRECATED=	Host is no longer resolvable using multiple different resolver
-EXPIRATION_DATE=	2025-08-23
-
-CONFLICTS_INSTALL=	gnotime-2.[0-3]* gnotime-2.4.0* gnotime-2.4.1 gnotime-2.4.1_[12]*
-
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-doxygen --disable-gdasql --disable-sqlite
+CONFIGURE_ARGS=	--disable-doxygen --disable-sqlite
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
-USES=		gmake gnome libtool pkgconfig
+USES=		autoreconf gmake gnome libtool pkgconfig
+USE_GITHUB=	yes
+GH_ACCOUNT=	GnoTime
+GH_PROJECT=	qof
+GH_TAGNAME=	f4b5d111a91af1e5606bd1db74c4db454ae77124
 USE_GNOME=	glib20 libxml2
 USE_LDCONFIG=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 post-patch:
-	@${REINPLACE_CMD} -e '/CFLAGS=/s|-g2||' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e '/CFLAGS=/s|-g2||' ${WRKSRC}/configure.ac
 	@${REINPLACE_CMD} -e 's|__isleap|qof_date_isleap|' \
 		${WRKSRC}/qof/qofdate.c
 	@${REINPLACE_CMD} -e '/^AM_CFLAGS =/s|-g||' \
-		${WRKSRC}/lib/libsql/Makefile.in \
-		${WRKSRC}/qof/Makefile.in
+		${WRKSRC}/lib/libsql/Makefile.am \
+		${WRKSRC}/qof/Makefile.am
 	@${REINPLACE_CMD} -e '/^sql_parse_test_DEPENDENCIES =/s/$$/ libqofsql.la/' \
-		${WRKSRC}/lib/libsql/Makefile.in
+		${WRKSRC}/lib/libsql/Makefile.am
 
 .include <bsd.port.mk>
diff --git a/databases/qof/distinfo b/databases/qof/distinfo
index d7771673d589..3a28ad5a551c 100644
--- a/databases/qof/distinfo
+++ b/databases/qof/distinfo
@@ -1,2 +1,3 @@
-SHA256 (qof_0.8.8.orig.tar.gz) = 2cecb942bb42fc77c42417cf9118512c73911c16ccea6e72ab28b8bdf60a4e2e
-SIZE (qof_0.8.8.orig.tar.gz) = 962548
+TIMESTAMP = 1759994696
+SHA256 (GnoTime-qof-g20250913-f4b5d111a91af1e5606bd1db74c4db454ae77124_GH0.tar.gz) = c749c79b1b7460655351a97bac09cfe229fbcab1f457b6b7b8a454e4cda220b9
+SIZE (GnoTime-qof-g20250913-f4b5d111a91af1e5606bd1db74c4db454ae77124_GH0.tar.gz) = 419233
diff --git a/databases/qof/files/patch-qof_Makefile.am b/databases/qof/files/patch-qof_Makefile.am
new file mode 100644
index 000000000000..c2f26e6ecfc1
--- /dev/null
+++ b/databases/qof/files/patch-qof_Makefile.am
@@ -0,0 +1,10 @@
+--- qof/Makefile.am.orig	2025-09-13 17:59:28 UTC
++++ qof/Makefile.am
+@@ -100,6 +100,7 @@ libqof_la_LIBADD = \
+   -DDATADIR=\""$(datadir)"\"
+ 
+ libqof_la_LIBADD = \
++ -L${top_builddir}/lib/libsql @SQL_PKG_LIB@ \
+   ${GMODULE_LIBS} \
+   ${GOBJECT_LIBS} \
+   ${GLIB_LIBS} \