diff --git a/sysutils/wmflame/Makefile b/sysutils/wmflame/Makefile
index 5c0e2c8b39b0..da6b44c53692 100644
--- a/sysutils/wmflame/Makefile
+++ b/sysutils/wmflame/Makefile
@@ -1,27 +1,24 @@
 PORTNAME=	wmflame
 PORTVERSION=	0.60
 PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	AFTERSTEP/stable/rpms/misc-tarballs \
 		http://web.novalis.org/programs/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Dockapp that shows the load average as a flame
 WWW=		http://web.novalis.org/
 
 LICENSE=	GPLv2
 
-BROKEN_FreeBSD_13=	ld: error: duplicate symbol: Root
-BROKEN_FreeBSD_14=	ld: error: duplicate symbol: Root
-
 USES=		gmake xorg
-USE_XORG=	x11 xpm
+USE_XORG=	x11 xext xpm
 
 PLIST_FILES=	bin/wmflame
 
 WRKSRC=		${WRKDIR}/wmflame.app/${PORTNAME}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wmflame ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/sysutils/wmflame/files/patch-wmgeneral_wmgeneral.c b/sysutils/wmflame/files/patch-wmgeneral_wmgeneral.c
new file mode 100644
index 000000000000..e3fafba3a215
--- /dev/null
+++ b/sysutils/wmflame/files/patch-wmgeneral_wmgeneral.c
@@ -0,0 +1,12 @@
+--- ../wmgeneral/wmgeneral.c.orig	1999-07-12 03:30:14 UTC
++++ ../wmgeneral/wmgeneral.c
+@@ -57,6 +57,9 @@
+  /* X11 Variables */
+ /*****************/
+ 
++Display		*display;
++Window		Root, iconwin, win;
++XpmIcon		wmgen;
+ int			screen;
+ int			x_fd;
+ int			d_depth;
diff --git a/sysutils/wmflame/files/patch-wmgeneral_wmgeneral.h b/sysutils/wmflame/files/patch-wmgeneral_wmgeneral.h
new file mode 100644
index 000000000000..87c392721b23
--- /dev/null
+++ b/sysutils/wmflame/files/patch-wmgeneral_wmgeneral.h
@@ -0,0 +1,15 @@
+--- ../wmgeneral/wmgeneral.h.orig	1999-06-17 06:48:13 UTC
++++ ../wmgeneral/wmgeneral.h
+@@ -36,9 +36,9 @@ typedef struct {
+  /* Global variable */
+ /*******************/
+ 
+-Display		*display;
+-Window          Root, iconwin, win;
+-XpmIcon		wmgen;
++extern Display		*display;
++extern Window		Root, iconwin, win;
++extern XpmIcon		wmgen;
+ 
+   /***********************/
+  /* Function Prototypes */