diff --git a/games/gnuchess/Makefile b/games/gnuchess/Makefile
index 21eb4a1964ba..b474e3209ef1 100644
--- a/games/gnuchess/Makefile
+++ b/games/gnuchess/Makefile
@@ -1,49 +1,58 @@
 PORTNAME=	gnuchess
 PORTVERSION=	6.2.9
 CATEGORIES=	games
 MASTER_SITES=	GNU/chess
 # The DISTFILES here is explicitly needed because it can be extended later.
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Classic Gnu Chess
 WWW=		https://savannah.gnu.org/projects/chess
 
 LICENSE=	GPLv3+
 
+USES=		cpe shebangfix
+CPE_VENDOR=	gnu
+CPE_PRODUCT=	chess
+
+SHEBANG_FILES=	doc/quotes.rb
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	MKDIR_P="${MKDIR}"
+
 INFO=		gnuchess
-USES=		cpe shebangfix
-SHEBANG_FILES=	doc/quotes.rb
-CPE_PRODUCT=	chess
-CPE_VENDOR=	gnu
 
 OPTIONS_DEFINE=		OPENING_BOOK DOCS NLS
 OPTIONS_DEFAULT=	OPENING_BOOK
 OPTIONS_SUB=		yes
+
 OPENING_BOOK_DESC=	Install opening book (25 MB download)
+
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPENING_BOOK}
 DISTFILES+=	book_1.02.pgn.gz
 EXTRACT_ONLY+=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 .endif
 
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+CPPFLAGS+=  -Dregister=
+.endif
+
 post-build:
 .if ${PORT_OPTIONS:MOPENING_BOOK}
 	zcat ${DISTDIR}/book_1.02.pgn.gz > ${WRKSRC}/src/book.pgn
 	cd ${WRKSRC}/src && ( ${ECHO} book add book.pgn; sleep 1; ${ECHO} quit ) | ./gnuchess
 	@${REINPLACE_CMD} -e '/Book =/s/false/true/' ${WRKSRC}/src/gnuchess.ini
 .endif
 
 post-install:
 	cd ${STAGEDIR}${PREFIX}/bin && ${LN} -f gnuchess gnuchessx
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/NEWS ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
 	${RM} ${STAGEDIR}${DOCSDIR}/gnuchess.info
 
 .include <bsd.port.mk>