diff --git a/misc/py-shell-gpt/Makefile b/misc/py-shell-gpt/Makefile
index 0032fccf71d5..2eaf32bf0a7a 100644
--- a/misc/py-shell-gpt/Makefile
+++ b/misc/py-shell-gpt/Makefile
@@ -1,38 +1,32 @@
 PORTNAME=	shell-gpt
 DISTVERSION=	0.8.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME:S/-/_/}-${DISTVERSION}
 
 MAINTAINER=	tagattie@FreeBSD.org
 COMMENT=	Command-line productivity tool powered by ChatGPT
 WWW=		https://github.com/TheR1D/shell_gpt
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}typer>=0.7.0<0.8:devel/py-typer@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}distro>=1.8.0<1.9:sysutils/py-distro@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rich>=13.3.1<13.4:textproc/py-rich@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.28.2<2.29:www/py-requests@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests-mock>0:www/py-requests-mock@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils pytest
 
 BINARY_ALIAS=	python=${PYTHON_CMD}
 NO_ARCH=	yes
 
-post-extract:
-	@${RM} ${WRKSRC}/tests/__init__.py
-
-post-patch:
-	@${FIND} ${WRKSRC} -type f -name '*.orig' -delete
-
 do-test:
 	cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m unittest tests/unittests.py
 	cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest tests/integrational_tests.py
 
 .include <bsd.port.mk>
diff --git a/misc/py-shell-gpt/files/patch-setup.py b/misc/py-shell-gpt/files/patch-setup.py
new file mode 100644
index 000000000000..a19ad8d57d5e
--- /dev/null
+++ b/misc/py-shell-gpt/files/patch-setup.py
@@ -0,0 +1,11 @@
+--- setup.py.orig	2023-04-03 09:02:01 UTC
++++ setup.py
+@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
+ setup(
+     name="shell_gpt",
+     version="0.8.1",
+-    packages=find_packages(),
++    packages=find_packages(exclude=['tests']),
+     install_requires=[
+         "typer~=0.7.0",
+         "requests~=2.28.2",
diff --git a/misc/py-shell-gpt/files/patch-shell__gpt.egg-info_SOURCES.txt b/misc/py-shell-gpt/files/patch-shell__gpt.egg-info_SOURCES.txt
deleted file mode 100644
index 8afe86591b47..000000000000
--- a/misc/py-shell-gpt/files/patch-shell__gpt.egg-info_SOURCES.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- shell_gpt.egg-info/SOURCES.txt.orig	2023-04-02 05:52:27 UTC
-+++ shell_gpt.egg-info/SOURCES.txt
-@@ -15,6 +15,3 @@ shell_gpt.egg-info/dependency_links.txt
- shell_gpt.egg-info/entry_points.txt
- shell_gpt.egg-info/requires.txt
- shell_gpt.egg-info/top_level.txt
--tests/__init__.py
--tests/integrational_tests.py
--tests/unittests.py
-\ No newline at end of file