diff --git a/x11-wm/euclid-wm/Makefile b/x11-wm/euclid-wm/Makefile
index c2b283946494..81dc2eb3d31f 100644
--- a/x11-wm/euclid-wm/Makefile
+++ b/x11-wm/euclid-wm/Makefile
@@ -1,56 +1,56 @@
 PORTNAME=	euclid-wm
 PORTVERSION=	0.4.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 
 MAINTAINER=	anastasios@mageirias.com
 COMMENT=	Minimalist, tiling window manager for X11
 WWW=		https://euclid-wm.sourceforge.net
 
 LICENSE=	BSD3CLAUSE
 
 USES=		gmake xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	wmdiem
 GH_TAGNAME=	b6b0319
 USE_XORG=	x11
 
 ALL_TARGET=		noxinerama
 
 PLIST_FILES=	bin/euclid-wm \
 		bin/start-euclid \
-		man/man1/euclid-wm.1.gz \
+		share/man/man1/euclid-wm.1.gz \
 		share/xsessions/euclid.desktop \
 		%%DATADIR%%/VERSION \
 		%%DATADIR%%/euclid-wm.conf \
 		%%DATADIR%%/euclidrc \
 		%%EUCLID_MENU%%bin/euclid-menu \
 		%%EUCLID_MENU%%share/euclid-menu/handlers/.echo_file.sh \
 		%%EUCLID_MENU%%share/euclid-menu/handlers/c.sh \
 		%%EUCLID_MENU%%share/euclid-menu/handlers/default.sh
 
 OPTIONS_DEFINE=		XINERAMA EUCLID_MENU
 OPTIONS_DEFAULT=	XINERAMA
 OPTIONS_SUB=		yes
 
 EUCLID_MENU_DESC=	Custom built menuing program (work in progress)
 
 EUCLID_MENU_ALL_TARGET=	euclid-menu
 XINERAMA_USE=		XORG=xinerama
 XINERAMA_ALL_TARGET=	euclid-wm
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 	@${REINPLACE_CMD} -e 's|^CFLAGS = |CFLAGS = -Wno-error=int-conversion |g' \
 		${WRKSRC}/Makefile
 .endif
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/euclid-wm
 
 post-install-EUCLID_MENU-on:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/euclid-menu
 
 .include <bsd.port.post.mk>
diff --git a/x11-wm/euclid-wm/files/patch-Makefile b/x11-wm/euclid-wm/files/patch-Makefile
index be5a41b5425d..873c69ab998c 100644
--- a/x11-wm/euclid-wm/files/patch-Makefile
+++ b/x11-wm/euclid-wm/files/patch-Makefile
@@ -1,68 +1,68 @@
 --- Makefile.orig	2015-09-06 19:45:03 UTC
 +++ Makefile
 @@ -1,6 +1,6 @@
 -PREFIX    = usr
 +PREFIX    = usr/local
  SHAREDIR  = ${PREFIX}/share
 -MANDIR    = ${SHAREDIR}/man
-+MANDIR    = ${PREFIX}/man
++MANDIR    = ${SHAREDIR}/man
  BINDIR    = ${PREFIX}/bin
  SVNREV 	  = 224 
  VER	  = 0.4.3
 @@ -13,7 +13,7 @@ endif
  CONFDIR = ${XDG_CONFIG_HOME}/euclid-wm
  
  CC = cc -pedantic -Wall 
 -CFLAGS = -O3 -g -std=c99 
 +CFLAGS = -O3 -g -std=c99 -I/usr/local/include -L/usr/local/lib 
  LDFLAGS = -lX11 -lXinerama
  
  .PHONY: all install install_conf clean uninstall dist dist_clean
 @@ -31,19 +31,34 @@ noxinerama: euclid-wm.c
  	cp noxinerama euclid-wm
  
  install: all
 -	@install -m755 euclid-wm -D ${DESTDIR}/${BINDIR}/euclid-wm
 -	@install -m644 euclid.desktop -D ${DESTDIR}/${SHAREDIR}/xsessions/euclid.desktop
 -	@install -m644 euclid.1 -D ${DESTDIR}/${MANDIR}/man1/euclid-wm.1
 -	@install -m644 euclid-wm.conf.sample -D -b ${DESTDIR}/${SHAREDIR}/euclid-wm/euclid-wm.conf
 -	@install -m644 euclidrc -D -b ${DESTDIR}/${SHAREDIR}/euclid-wm/euclidrc
 -	@install -m644 VERSION -D ${DESTDIR}/${SHAREDIR}/euclid-wm/VERSION 2>/dev/null || echo "From SVN: `svn info | grep Revision: | cut -d ' ' -f2`/`date +%F`" >${DESTDIR}/${SHAREDIR}/euclid-wm/VERSION
 -	@sed s_/usr/share_/${SHAREDIR}_ <start-euclid >start-euclid-local
 -	@install -m755 start-euclid-local -D ${DESTDIR}/${BINDIR}/start-euclid
 -	@install -m755 euclid-menu -D ${DESTDIR}/${BINDIR}/euclid-menu
 -	@install -m755 ./handlers/c.sh -D  ${DESTDIR}/${SHAREDIR}/euclid-menu/handlers/c.sh
 -	@install -m755 ./handlers/default.sh -D ${DESTDIR}/${SHAREDIR}/euclid-menu/handlers/default.sh
 -	@install -m755 ./handlers/.echo_file.sh -D ${DESTDIR}/${SHAREDIR}/euclid-menu/handlers/.echo_file.sh
 -
 +#	@install -m755 euclid-wm -D ${DESTDIR}/${BINDIR}/euclid-wm
 +	@cp -f euclid-wm ${DESTDIR}/${BINDIR}/euclid-wm
 +#	@install -m644 euclid.desktop -D ${DESTDIR}/${SHAREDIR}/xsessions/euclid.desktop
 +	@mkdir -p ${DESTDIR}/${SHAREDIR}/xsessions
 +	@cp -f euclid.desktop ${DESTDIR}/${SHAREDIR}/xsessions/euclid.desktop
 +#	@install -m644 euclid.1 -D ${DESTDIR}/${MANDIR}/man1/euclid-wm.1
 +	@cp -f euclid.1 ${DESTDIR}/${MANDIR}/man1/euclid-wm.1
 +#	@install -m644 euclid-wm.conf.sample -D -b ${DESTDIR}/${SHAREDIR}/euclid-wm/euclid-wm.conf
 +	@mkdir -p ${DESTDIR}/${SHAREDIR}/euclid-wm
 +	@cp -f euclid-wm.conf.sample ${DESTDIR}/${SHAREDIR}/euclid-wm/euclid-wm.conf
 +#	@install -m644 euclidrc -D -b ${DESTDIR}/${SHAREDIR}/euclid-wm/euclidrc
 +	@cp -f euclidrc ${DESTDIR}/${SHAREDIR}/euclid-wm/euclidrc
 +#	@install -m644 VERSION -D ${DESTDIR}/${SHAREDIR}/euclid-wm/VERSION 2>/dev/null || echo "From SVN: `svn info | grep Revision: | cut -d ' ' -f2`/`date +%F`" >${DESTDIR}/${SHAREDIR}/euclid-wm/VERSION
 +	@echo ${VER}" "${SVNREV} > ${DESTDIR}/${SHAREDIR}/euclid-wm/VERSION
 +#	@cp -f VERSION ${DESTDIR}/${SHAREDIR}/euclid-wm/VERSION
 +#	@sed s_/usr/share_/${SHAREDIR}_ <start-euclid >start-euclid-local
 +	@sed 's /usr/share /${SHAREDIR} ' <start-euclid >start-euclid-local
 +#	@install -m755 start-euclid-local -D ${DESTDIR}/${BINDIR}/start-euclid
 +	@cp -f start-euclid-local ${DESTDIR}/${BINDIR}/start-euclid
 +#	@install -m755 euclid-menu -D ${DESTDIR}/${BINDIR}/euclid-menu
 +	@cp -f euclid-menu ${DESTDIR}/${BINDIR}/euclid-menu
 +#	@install -m755 ./handlers/c.sh -D  ${DESTDIR}/${SHAREDIR}/euclid-menu/handlers/c.sh
 +	@mkdir -p ${DESTDIR}/${SHAREDIR}/euclid-menu/handlers
 +	@cp -f ./handlers/c.sh ${DESTDIR}/${SHAREDIR}/euclid-menu/handlers/c.sh
 +#	@install -m755 ./handlers/default.sh -D ${DESTDIR}/${SHAREDIR}/euclid-menu/handlers/default.sh
 +	@cp -f ./handlers/default.sh ${DESTDIR}/${SHAREDIR}/euclid-menu/handlers/default.sh
 +#	@install -m755 ./handlers/.echo_file.sh -D ${DESTDIR}/${SHAREDIR}/euclid-menu/handlers/.echo_file.sh
 +	@cp -f ./handlers/.echo_file.sh ${DESTDIR}/${SHAREDIR}/euclid-menu/handlers/.echo_file.sh
  
  
  install_conf: