diff --git a/games/xtrojka/Makefile b/games/xtrojka/Makefile
index 282c055f3f3f..6fb36be4ccb2 100644
--- a/games/xtrojka/Makefile
+++ b/games/xtrojka/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	xtrojka
 PORTVERSION=	1.2.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	SUNSITE/games/arcade/tetris
 DISTNAME=	${PORTNAME}${PORTVERSION:C/\.//g}
 
 MAINTAINER=	ports@edwinm.ik.nu
 COMMENT=	Game of skill similar to T*tris
 
 USES=		xorg
 USE_XORG=	x11 xt xorgproto xaw xmu xext
 
 MAKE_JOBS_UNSAFE=	yes
 INSTALL_TARGET=	install PREFIX=${STAGEDIR}${PREFIX}
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
 .include <bsd.port.options.mk>
 
 post-patch:
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 	@${REINPLACE_CMD} -e 's|CFLAGS=|CFLAGS=-Wno-error=incompatible-function-pointer-types |g' \
 		${WRKSRC}/Makefile
 .endif
 
 pre-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/xtrojka
 
 .include <bsd.port.mk>
diff --git a/games/xtrojka/files/patch-Makefile b/games/xtrojka/files/patch-Makefile
index 89c3d61786bd..9c6c9c1b35ed 100644
--- a/games/xtrojka/files/patch-Makefile
+++ b/games/xtrojka/files/patch-Makefile
@@ -1,75 +1,79 @@
 --- Makefile.orig	1996-07-27 18:05:03 UTC
 +++ Makefile
-@@ -10,15 +10,15 @@ PROGS= xtrojka
+@@ -10,15 +10,15 @@ VERSION=123
  #					xtrojka version (do not change!)
  VERSION=123
  #					where to put the binary
 -TARGET_DIR=/usr/games
 +TARGET_DIR=${PREFIX}/bin
  #					where to put the manpage
 -MANDIR=/usr/local/man/man6
-+MANDIR=${PREFIX}/man/man6
++MANDIR=${PREFIX}/share/man/man6
  #					the location of the highscorefile
 -HSFILE=/fill_in_your_scorefile
 +HSFILE=${PREFIX}/share/xtrojka/xtrojka.scores
  #					your favourite packer
  COMPRESS=gzip -v9
  #					your favourite c-compiler
 -CC=gcc
 +CC?=gcc
  #					used X libraries
  XLIBS= -lXaw -lXmu -lXt -lX11 -lXext
  #					some more X libraries
 @@ -48,7 +48,7 @@ HSF=-DSCOREFILE='"$(HSFILE)"'
  #	comment out your favorite system (the one you use, that is...)
  #
  #					search the libaries here
 -LIBPATH=-L/usr/X11/lib
 +LIBPATH=-L${LOCALBASE}/lib
  #					doesn't work too well on all systems
  #LCK=-DLOCKING
  #					add debug info
-@@ -75,7 +75,13 @@ XPMLIB=-lXpm
+@@ -75,11 +75,17 @@ XPMLIB=-lXpm
  #
  # Linux
  #
 -SYS=-DLINUX
 +#SYS=-DLINUX
-+
-+#
+ 
+ #
 +# FreeBSD
-+#
+ #
 +XDIR=-I${LOCALBASE}/include
 +LIBS=-lm
- 
- #
++
  #
-@@ -105,11 +111,14 @@ tar:
++#
++#
+ CFLAGS= $(XDIR) $(DBG) $(XPM) $(SYS) $(OPT) $(HSF) $(LCK) $(LIBPATH) 
+ 
+ ###########################################################################
+@@ -105,11 +111,14 @@ install:
  	rm -rf xtrojka$(VERSION);
  
  install:
 -	@echo $(HSFILE)|sed -e 's/\//\\\//g'>/tmp/hsn; \
 -	sed -e "s/__SCOREDIR__/`cat /tmp/hsn`/g" xtrojka.man > xtrojka.6; \
 -	cp xtrojka.6 $(MANDIR); chmod go+r xtrojka.6; \
 -	cp xtrojka $(TARGET_DIR);chmod go+rx xtrojka; \
 -	touch $(HSFILE); chmod go+rwx $(HSFILE);
 +	@rm -f hsn
 +	echo $(HSFILE)|sed -e 's/\//\\\//g'>hsn
 +	sed -e "s/__SCOREDIR__/`cat hsn`/g" xtrojka.man > xtrojka.6
 +	gzip -c xtrojka.6 >$(MANDIR)/xtrojka.6.gz
 +	$(BSD_INSTALL_PROGRAM) xtrojka $(TARGET_DIR)
 +	touch $(HSFILE)
 +	chmod 664 $(HSFILE)
 +	@rm -f hsn
  	
  clean:
  	rm -rf tags *.o core xtrojka xtrojka.6 
 @@ -119,7 +128,7 @@ clean:
  #	DEPENDENCIES
  #
  
 -_strdefs.h _resdefs.h:	XTrojka 
 +_strdefs.h _resdefs.h:	XTrojka.uk
  	$(RESGEN)
  
  actions.o: actions.c actions.h xtrojka.h debug.h
diff --git a/games/xtrojka/pkg-plist b/games/xtrojka/pkg-plist
index ca4c5737a62e..902077cc6c16 100644
--- a/games/xtrojka/pkg-plist
+++ b/games/xtrojka/pkg-plist
@@ -1,3 +1,3 @@
 @(,games,2755) bin/xtrojka
 @(,games,) share/xtrojka/xtrojka.scores
-man/man6/xtrojka.6.gz
+share/man/man6/xtrojka.6.gz