diff --git a/sysutils/dmg2img/Makefile b/sysutils/dmg2img/Makefile
index 1b42c8506b58..90dcb8df2a90 100644
--- a/sysutils/dmg2img/Makefile
+++ b/sysutils/dmg2img/Makefile
@@ -2,25 +2,26 @@
 # $FreeBSD$
 
 PORTNAME=	dmg2img
-PORTVERSION=	1.6.6
+PORTVERSION=	1.6.7
 CATEGORIES=	sysutils
-MASTER_SITES=	http://vu1tur.eu.org/tools/
-
-LICENSE=	GPLv2
+MASTER_SITES=	http://vu1tur.eu.org/tools/ \
+		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	DMG2IMG convert tool
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 USES=		ssl
-PLIST_FILES=	bin/${PORTNAME} \
+
+PLIST_FILES=	bin/dmg2img \
 		bin/vfdecrypt
 
-pre-configure:
-	${REINPLACE_CMD} -e 's|%%PREFIX%%|${STAGEDIR}${PREFIX}/bin|g' \
-		-e "s|\(CFLAGS =\)|\1 -I${OPENSSLINC} |g" \
-		-e "s|\(-lcrypto\)|-L${OPENSSLLIB} \1|g" ${WRKSRC}/Makefile
+post-patch:
+	@${REINPLACE_CMD} -e '/^CFLAGS = / s|$$| -I${OPENSSLINC}|; s| -lcrypto| -L${OPENSSLLIB}&|' ${WRKSRC}/Makefile
 
-post-build:
-	${MAKE} -C ${WRKSRC} install
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/dmg2img ${WRKSRC}/vfdecrypt ${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.mk>
diff --git a/sysutils/dmg2img/distinfo b/sysutils/dmg2img/distinfo
index 879a0d371278..99b58e9e2698 100644
--- a/sysutils/dmg2img/distinfo
+++ b/sysutils/dmg2img/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486535177
-SHA256 (dmg2img-1.6.6.tar.gz) = 9ba6384a7fb8cc852efa87df5e2b4e1d493dc5bff1a77daf2435fa00301adc85
-SIZE (dmg2img-1.6.6.tar.gz) = 23115
+TIMESTAMP = 1519418904
+SHA256 (dmg2img-1.6.7.tar.gz) = 02aea6d05c5b810074913b954296ddffaa43497ed720ac0a671da4791ec4d018
+SIZE (dmg2img-1.6.7.tar.gz) = 23238
diff --git a/sysutils/dmg2img/files/patch-Makefile b/sysutils/dmg2img/files/patch-Makefile
deleted file mode 100644
index f623b1a35a3b..000000000000
--- a/sysutils/dmg2img/files/patch-Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.orig	2010-03-25 03:38:08.000000000 +0700
-+++ Makefile	2010-07-20 02:29:20.000000000 +0800
-@@ -1,6 +1,7 @@
- #CC = gcc
- CFLAGS = -O2 -Wall
--BIN_DIR = ${DESTDIR}/usr/bin
-+BIN_DIR = %%PREFIX%%
-+INSTALL = /usr/bin/install -m 755
- 
- all: dmg2img vfdecrypt 
- 
-@@ -21,7 +22,7 @@
- 
- install: dmg2img vfdecrypt
- 	mkdir -p ${BIN_DIR}
--	install -c -s -m 755 -o root -g root dmg2img vfdecrypt $(BIN_DIR)
-+	$(INSTALL) dmg2img vfdecrypt $(BIN_DIR)
- 
- clean:
- 	rm -f dmg2img vfdecrypt *~ *.o core
diff --git a/sysutils/dmg2img/pkg-descr b/sysutils/dmg2img/pkg-descr
index bdfe661315db..727389a517a8 100644
--- a/sysutils/dmg2img/pkg-descr
+++ b/sysutils/dmg2img/pkg-descr
@@ -1,4 +1,5 @@
-DMG2IMG is an Apple's compressed dmg to standard (hfsplus) image disk file
-convert tool. It is derived from dmg2iso v0.2c by vu1tur.
+DMG2IMG is a tool which allows converting Apple compressed dmg archives to
+standard (hfsplus) image disk files. This tool handles zlib and bzip2 compressed
+dmg images.
 
 WWW: http://vu1tur.eu.org/tools/