diff --git a/comms/py-pyserial/Makefile b/comms/py-pyserial/Makefile
index 7dd89f348134..4e53177b4903 100644
--- a/comms/py-pyserial/Makefile
+++ b/comms/py-pyserial/Makefile
@@ -1,25 +1,41 @@
 # Created by: Hye-Shik Chang <perky@fallin.lv>
 
 PORTNAME=	pyserial
 PORTVERSION=	3.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sbz@FreeBSD.org
 COMMENT=	Serial port encapsulation library for Python
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-USES=		python:3.6+
+USES=		python:3.6+ shebangfix
+SHEBANG_FILES=	examples/*.py
 
 USE_PYTHON=	distutils autoplist concurrent
 
+PORTEXAMPLES=   at_protocol.py port_publisher.py rfc2217_server.py \
+		setup-miniterm-py2exe.py setup-rfc2217_server-py2exe.py \
+		setup-wxTerminal-py2exe.py tcp_serial_redirect.py \
+		wxSerialConfigDialog.py wxTerminal.py
+
+EXAMPLESDIR=    ${PREFIX}/share/examples/py-${PORTNAME}
+
+OPTIONS_DEFINE=	EXAMPLES
+
 NO_ARCH=	yes
 
+post-install:
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_SCRIPT} ${PORTEXAMPLES:S,^,${WRKSRC}/examples/,} \
+	    ${STAGEDIR}${EXAMPLESDIR}
+
 do-test:
-	${SETENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} ${PYTHON_CMD} ${WRKSRC}/test/test.py
+	${SETENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} \
+	    ${PYTHON_CMD} ${WRKSRC}/test/test.py
 
 .include <bsd.port.mk>