diff --git a/cad/gspiceui/Makefile b/cad/gspiceui/Makefile
index b61c43b758f2..1edf5194b532 100644
--- a/cad/gspiceui/Makefile
+++ b/cad/gspiceui/Makefile
@@ -1,54 +1,50 @@
 PORTNAME=	gspiceui
-PORTVERSION=	1.1.00
-PORTREVISION=	7
+DISTVERSION=	1.1.00
+PORTREVISION=	8
 CATEGORIES=	cad
-MASTER_SITES=	SF/${PORTNAME}/gSpiceUI/${PORTNAME}-v${PORTVERSION}
-DISTNAME=	${PORTNAME}-v${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/gSpiceUI/${PORTNAME}-v${DISTVERSION}
+DISTNAME=	${PORTNAME}-v${DISTVERSION}
 
 MAINTAINER=	kevinz5000@gmail.com
 COMMENT=	GUI for ngspice and gnucap circuit simulators
-WWW=		http://users.tpg.com.au/micksw012/gspiceui.html
+WWW=		https://sourceforge.net/projects/gspiceui/
 
 LICENSE=	GPLv3
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
-
-USE_WX=		3.0
 USES=		compiler:c++11-lib gmake pkgconfig
+USE_WX=		3.0
 
 CXXFLAGS+=	-std=c++11
 
 DESKTOP_ENTRIES=	"GSpiceUI" "Circuit Simulator GUI" \
 			"${PREFIX}/share/pixmaps/gspiceui-48x48.xpm" \
 			"gspiceui" "Science;Electronics;" false
 
-PORTDOCS=	*
-PORTEXAMPLES=	*
 PLIST_FILES=	bin/gspiceui share/pixmaps/gspiceui-48x48.xpm \
 		share/man/man1/gspiceui.1.gz
+PORTDOCS=	*
+PORTEXAMPLES=	*
+
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 CFLAGS:=	${CFLAGS:C/-O[2-9]/-O1/g}
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|share/gspiceui|${DOCSDIR}|g' \
+	@${REINPLACE_CMD} -e 's|/share/gspiceui|${DOCSDIR:S|^${PREFIX}||}|g' \
 	    ${WRKSRC}/src/main/HelpTasks.cpp
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/gspiceui ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/src/icons/gspiceui-48x48.xpm \
 	    ${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_MAN} ${WRKSRC}/gspiceui.1 ${STAGEDIR}${PREFIX}/share/man/man1
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR} \
 		"! -name Makefile")
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-.for dir in lib sch
-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${STAGEDIR}${EXAMPLESDIR} \
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} "lib sch" ${STAGEDIR}${EXAMPLESDIR} \
 		"! -name Makefile")
-.endfor
 
 .include <bsd.port.post.mk>