diff --git a/multimedia/szap-s2/Makefile b/multimedia/szap-s2/Makefile
index c6bc09edca10..9a60395fb89f 100644
--- a/multimedia/szap-s2/Makefile
+++ b/multimedia/szap-s2/Makefile
@@ -9,21 +9,27 @@ MASTER_SITES=	LOCAL/nox
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple zapping tool for the Linux DVB S2 API
 
+LICENSE=	GPLv2+
+
 BUILD_DEPENDS=  ${LOCALBASE}/include/linux/dvb/frontend.h:multimedia/v4l_compat
 
 USES=		gmake tar:bzip2
-PATCH_STRIP=	-p1
 USE_CSTD=	gnu89
-MAKE_ARGS=	INCLUDE=-I"${LOCALBASE}/include"
-MAKE_ARGS+=	CC="${CC}"
-MAKE_ARGS+=	CXX="${CXX}"
+MAKE_ARGS=	INCLUDE=-I"${LOCALBASE}/include" \
+		CC="${CC}" \
+		CXX="${CXX}"
 WRKSRC=		${WRKDIR}/szap-s2-e34f73b254db
+
 PORTDOCS=	README
 PLIST_FILES=	bin/szap-s2
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
-	(cd ${WRKSRC} && ${INSTALL_PROGRAM} szap-s2 ${STAGEDIR}/${PREFIX}/bin)
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
+	${INSTALL_PROGRAM} ${WRKSRC}/szap-s2 ${STAGEDIR}/${PREFIX}/bin
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/multimedia/szap-s2/files/patch-teletext b/multimedia/szap-s2/files/patch-teletext
index 84edc356d9f9..66937431db84 100644
--- a/multimedia/szap-s2/files/patch-teletext
+++ b/multimedia/szap-s2/files/patch-teletext
@@ -1,5 +1,5 @@
---- a/szap-s2.c
-+++ b/szap-s2.c
+--- szap-s2.c.orig	2010-01-29 22:54:19 UTC
++++ szap-s2.c
 @@ -206,6 +206,7 @@ static char *usage_str =
      "     -i        : run interactively, allowing you to type in channel names\n"
      "     -p        : add pat and pmt to TS recording (implies -r)\n"