diff --git a/x11-clocks/buici-clock/Makefile b/x11-clocks/buici-clock/Makefile
index 7e4a48203990..c53c6cb7cc73 100644
--- a/x11-clocks/buici-clock/Makefile
+++ b/x11-clocks/buici-clock/Makefile
@@ -1,39 +1,35 @@
 PORTNAME=	buici-clock
-PORTVERSION=	0.4.9.4
-PORTREVISION=	2
+PORTVERSION=	0.4.10
 CATEGORIES=	x11-clocks
-MASTER_SITES=	DEBIAN
-DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	rodrigo@FreeBSD.org
 COMMENT=	Xlib implementation of an attractive, configurable clock
-WWW=		https://packages.qa.debian.org/b/buici-clock.html
+WWW=		https://github.com/rosorio/buici-clock
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libcairo.so:graphics/cairo
 
 USES=		autoreconf bison gmake pkgconfig tar:xz xorg
 USE_CXXSTD=	c++14
+USE_GITHUB=	yes
+GH_ACCOUNT=	rosorio
+GH_PROJECT=	buici-clock
 USE_XORG=	x11 xext
 
 GNU_CONFIGURE=	yes
 
-MAKE_JOBS_UNSAFE=	yes
-
-WRKSRC=		${WRKDIR}/buici
-
 PLIST_FILES=	bin/buici-clock \
 		share/man/man1/buici-clock.1.gz
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|echo -e|echo| ; \
-		 s|-g | |' ${WRKSRC}/Makefile.in
+		s|-g | |' ${WRKSRC}/Makefile.in
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/buici-clock ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/buici-clock.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/x11-clocks/buici-clock/distinfo b/x11-clocks/buici-clock/distinfo
index 94d6a76441fa..b28c163f3b84 100644
--- a/x11-clocks/buici-clock/distinfo
+++ b/x11-clocks/buici-clock/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490998659
-SHA256 (buici-clock_0.4.9.4.tar.xz) = f5138d220568e3ba5afd272c61a63e5a1a0009a6023387d2a0cbf15af9b3649f
-SIZE (buici-clock_0.4.9.4.tar.xz) = 108988
+TIMESTAMP = 1789960624
+SHA256 (rosorio-buici-clock-0.4.10_GH0.tar.gz) = db976f3fd51842d1fbb5a2ba96264ca5e0b45fbbf0eccabf8c5cd5350312d582
+SIZE (rosorio-buici-clock-0.4.10_GH0.tar.gz) = 561090
diff --git a/x11-clocks/buici-clock/files/patch-configure.ac b/x11-clocks/buici-clock/files/patch-configure.ac
new file mode 100644
index 000000000000..42c5235a529f
--- /dev/null
+++ b/x11-clocks/buici-clock/files/patch-configure.ac
@@ -0,0 +1,10 @@
+--- configure.ac.orig	2026-09-02 15:44:14.000000000 +0000
++++ configure.ac	2026-09-04 14:48:41.166531000 +0000
+@@ -57,6 +57,7 @@
+ AC_SUBST(XO_PATH)
+ AC_SUBST(CFLAGS_W)
+ AC_CONFIG_FILES([Makefile])
++AC_CONFIG_SUBDIRS([xo])
+ AC_OUTPUT
+ 
+ dnl -- Prevent accidental edits.  
diff --git a/x11-clocks/buici-clock/files/patch-xo_Makefile.in b/x11-clocks/buici-clock/files/patch-xo_Makefile.in
index 3fad0b5f4dfa..0bee3b1e0655 100644
--- a/x11-clocks/buici-clock/files/patch-xo_Makefile.in
+++ b/x11-clocks/buici-clock/files/patch-xo_Makefile.in
@@ -1,21 +1,13 @@
---- xo/Makefile.in.orig	2012-12-29 18:51:57 UTC
-+++ xo/Makefile.in
-@@ -60,8 +60,8 @@ CXXFLAGS=@CXXFLAGS@
+--- xo/Makefile.in.orig	2026-09-02 15:44:14.000000000 +0000
++++ xo/Makefile.in	2026-09-04 12:41:25.726329000 +0000
+@@ -60,8 +60,8 @@
  #CXXFLAGS=-${CXXFLAGS} -O
  #CXXFLAGS=-${CXXFLAGS} -O2
  #CXXFLAGS=-${CXXFLAGS} -fomit-frame-pointer
 -CXXFLAGS_=-g @CFLAGS_W@@X_CFLAGS@
 -LFLAGS=-g @LDFLAGS@@X_LIBS@@LIBS@ -lX11 -lXext @X_EXTRA_LIBS@
-+CXXFLAGS+= @CFLAGS_W@@X_CFLAGS@
-+LFLAGS= @LDFLAGS@@X_LIBS@ @LIBS@ -lX11 -lXext @X_EXTRA_LIBS@
++CXXFLAGS+=-g @CFLAGS_W@@X_CFLAGS@
++LFLAGS=-g @LDFLAGS@@X_LIBS@ @LIBS@ -lX11 -lXext @X_EXTRA_LIBS@
  FLEX=@LEX@
  YACC=@YACC@
  
-@@ -104,7 +104,6 @@ $(O_D)%.o: %.s
- 
- %.cxx: %.y
- 	$(YACC) -d -o $@ $<
--	mv $(basename $@).hxx $(basename $@).h
- 
- %.i: %.cxx
- 	$(CC) -c $(CXXFLAGS) $(CXXFLAGS_) -E -o $(notdir $@) $<
diff --git a/x11-clocks/buici-clock/files/patch-xo_res.cxx b/x11-clocks/buici-clock/files/patch-xo_res.cxx
deleted file mode 100644
index c60b0902e405..000000000000
--- a/x11-clocks/buici-clock/files/patch-xo_res.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- xo/res.cxx.orig	2012-12-29 18:51:57 UTC
-+++ xo/res.cxx
-@@ -43,7 +43,7 @@
- 
- #define IS_PARSER
- #include "lres.h"
--#include "res_y.h"
-+#include "res_y.hxx"
- 
- #define LONG_PRIME_MAX		(LONG_MAX/10)
- #define LONG_PRIME_MAX_REM	(LONG_MAX - LONG_PRIME_MAX*10)
diff --git a/x11-clocks/buici-clock/files/patch-xo_res__l.l b/x11-clocks/buici-clock/files/patch-xo_res__l.l
deleted file mode 100644
index 6b749e6988d5..000000000000
--- a/x11-clocks/buici-clock/files/patch-xo_res__l.l
+++ /dev/null
@@ -1,11 +0,0 @@
---- xo/res_l.l.orig	2012-12-29 18:51:57 UTC
-+++ xo/res_l.l
-@@ -33,7 +33,7 @@
- #include "standard.h"
- #define IS_PARSER
- #include "lres.h"
--#include "res_y.h"
-+#include "res_y.hxx"
- #include <limits.h>
- 
- #if defined (__cplusplus)