diff --git a/graphics/optar/Makefile b/graphics/optar/Makefile
index 12f38d778915..444dedf64f4d 100644
--- a/graphics/optar/Makefile
+++ b/graphics/optar/Makefile
@@ -3,31 +3,37 @@
 
 PORTNAME=	optar
 PORTVERSION=	1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
-MASTER_SITES=	http://xps.crucible.gr/
-DISTFILES=	optar.tgz \
-		font.h
-EXTRACT_ONLY=	optar.tgz
+MASTER_SITES=	http://ronja.twibright.com/
+DISTFILES=	optar.tgz
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A tool for encoding data on paper
+COMMENT=	Tool for encoding data on paper
 
-DEPRECATED=	No more public distfiles
-EXPIRATION_DATE=	2014-03-10
+LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/include/libpng15/png.h:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
 RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
 
-USE_GMAKE=	yes
-WRKSRC=		${WRKDIR}/optar
+WRKSRC=		${WRKDIR}/optar_dist
+
+USES=		gmake
 
 PLIST_FILES=	bin/optar bin/unoptar bin/pgm2ps
 
-NO_STAGE=	yes
-post-extract:
-	@${RM} -v ${WRKSRC}/font.h
-	@${CP} -v ${DISTDIR}/font.h ${WRKSRC}/font.h
-	@${SED} 's:/usr/local:${LOCALBASE}:g' ${WRKSRC}/Makefile > ${WRKSRC}/Makefile.new
-	@${MV} ${WRKSRC}/Makefile.new ${WRKSRC}/Makefile
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|^CFLAGS|#CFLAGS| ; \
+		 s|gcc |$$(CC) | ; \
+		 s|-I/usr/local/include/libpng|`libpng-config --I_opts`| ; \
+		 s|-L/usr/local/lib|`libpng-config --L_opts`|' \
+		${WRKSRC}/Makefile
+
+do-install:
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} optar unoptar \
+		${STAGEDIR}${PREFIX}/bin)
+	(cd ${WRKSRC} && ${INSTALL_SCRIPT} pgm2ps \
+		${STAGEDIR}${PREFIX}/bin)
+
 .include <bsd.port.mk>
diff --git a/graphics/optar/distinfo b/graphics/optar/distinfo
index cc808725da3f..c5a6d17fdadc 100644
--- a/graphics/optar/distinfo
+++ b/graphics/optar/distinfo
@@ -1,4 +1,2 @@
-SHA256 (optar.tgz) = 9c37dfba31e2d5ebb43a2ac066b67d774bf7ba059f882047668be6567793c942
-SIZE (optar.tgz) = 28384
-SHA256 (font.h) = f4e284c152fde4034f0950e4b52ee137f0e3085dd510f3ccc898aaaf3d8f3bce
-SIZE (font.h) = 81164
+SHA256 (optar.tgz) = b78fa6a41f6c699917f8b537c63bdf99b93133f034b4e1eaeabd0b6cbc9c5819
+SIZE (optar.tgz) = 37825
diff --git a/graphics/optar/pkg-descr b/graphics/optar/pkg-descr
index 5e91241396af..5e98da42008d 100644
--- a/graphics/optar/pkg-descr
+++ b/graphics/optar/pkg-descr
@@ -1,6 +1,5 @@
-Optar stands for OPTical ARchiver.
-It's a codec for encoding data on paper, then you print it with a laser printer.
-If you want to read the recording, scan it with a scanner and feed into the
-decoder program.
+Optar stands for OPTical ARchiver. It's a codec for encoding data on
+paper, then you print it with a laser printer. If you want to read the
+recording, scan it with a scanner and feed into the decoder program.
 
 WWW: http://ronja.twibright.com/optar/