diff --git a/graphics/fig2sxd/Makefile b/graphics/fig2sxd/Makefile
index e19d24c03648..41319f03b002 100644
--- a/graphics/fig2sxd/Makefile
+++ b/graphics/fig2sxd/Makefile
@@ -1,35 +1,35 @@
 # New ports collection makefile for:	fig2sxd
 # Date created:				6 Sep 2005
 # Whom:					Emanuel Haupt <ehaupt@critical.ch>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	fig2sxd
-PORTVERSION=	0.17
+PORTVERSION=	0.18
 CATEGORIES=	graphics converters
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Convert .xfig files to the OpenOffice draw format
 
 USE_GMAKE=	yes
 USE_GCC=	3.4+
 
-WRKSRC=		${WRKDIR}/${DISTNAME:C/_/-/}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 MAN1=		fig2sxd.1
 PLIST_FILES=	bin/fig2sxd
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/^CXX/d; s|^\(all:\).*|\1 $$(TARGET1) fig2sxd.1|' \
 			${WRKSRC}/${MAKEFILE}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/graphics/fig2sxd/distinfo b/graphics/fig2sxd/distinfo
index cc6f33367ed6..ae715f33d076 100644
--- a/graphics/fig2sxd/distinfo
+++ b/graphics/fig2sxd/distinfo
@@ -1,3 +1,3 @@
-MD5 (fig2sxd_0.17.orig.tar.gz) = e19cfffa8284bc250159b257bfac6bcc
-SHA256 (fig2sxd_0.17.orig.tar.gz) = b15a11459678fc8f52896563e878bc706980c0b73bf67fa4daf46b92bb41f623
-SIZE (fig2sxd_0.17.orig.tar.gz) = 22348
+MD5 (fig2sxd_0.18.orig.tar.gz) = 42fcdc479ae369c6430f44b15e16e2db
+SHA256 (fig2sxd_0.18.orig.tar.gz) = d2d1662c7477ea9e63a77fa29a5bfc62eaaf461a0c499e552284448ca289ca2f
+SIZE (fig2sxd_0.18.orig.tar.gz) = 23761