diff --git a/graphics/sam2p/Makefile b/graphics/sam2p/Makefile
index 12ab0ec98bf0..1620528edef5 100644
--- a/graphics/sam2p/Makefile
+++ b/graphics/sam2p/Makefile
@@ -1,41 +1,38 @@
 # ex:ts=8
 # Ports collection makefile for:	sam2p
 # Date created:			Jan 7, 2003
 # Whom:				ijliao
 #
 # $FreeBSD$
 #
 
 PORTNAME=	sam2p
-PORTVERSION=	0.44.4
+PORTVERSION=	0.44
+PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.inf.bme.hu/~pts/
 DISTNAME=	${PORTNAME}-latest
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Converts raster (bitmap) image formats into PS or PDF files
 
-BROKEN=		Size mismatch
-
 BUILD_DEPENDS=	tif22pnm:${PORTSDIR}/graphics/tif22pnm \
 		tifftopnm:${PORTSDIR}/graphics/netpbm \
 		zip:${PORTSDIR}/archivers/zip \
 		bash:${PORTSDIR}/shells/bash2
 LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg
 
 USE_GHOSTSCRIPT_RUN=	yes
 
-WRKSRC=		${WRKDIR}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 PLIST_FILES=	bin/sam2p
 USE_PERL5_BUILD=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 ALL_TARGET=	${PORTNAME}
 
-.include <bsd.port.pre.mk>
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sam2p ${PREFIX}/bin
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/sam2p/distinfo b/graphics/sam2p/distinfo
index fcf38e9a6347..42980ef2926e 100644
--- a/graphics/sam2p/distinfo
+++ b/graphics/sam2p/distinfo
@@ -1,3 +1,3 @@
-MD5 (sam2p-latest.tar.gz) = 36898025e227e1b2b69945ea2bb75463
-SHA256 (sam2p-latest.tar.gz) = d30bb8aae2b7cb10aafbbeeda81b48644db1713287f1bad1ac40192323533424
-SIZE (sam2p-latest.tar.gz) = 528431
+MD5 (sam2p-latest.tar.gz) = eee0b66dc4650dc6b09013711b420b4c
+SHA256 (sam2p-latest.tar.gz) = 012a49fc18d79853752b1935275fd6692bca646b1c2da149ded00a61c621c750
+SIZE (sam2p-latest.tar.gz) = 548035