diff --git a/x11/py-pynput/Makefile b/x11/py-pynput/Makefile
index 9cdd1b233bed..c59bbf026d86 100644
--- a/x11/py-pynput/Makefile
+++ b/x11/py-pynput/Makefile
@@ -1,30 +1,34 @@
 PORTNAME=	pynput
-DISTVERSION=	1.7.6
-PORTREVISION=	3
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1.7.7
 CATEGORIES=	x11
-MASTER_SITES=	PYPI # no tests on PYPI, but GitHub tarball doesn't bui;d
+#MASTER_SITES=	PYPI # no tarball on PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Send virtual input commands
 WWW=		https://github.com/moses-palmer/pynput
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING.LGPL
 
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}evdev>=1.3:devel/py-evdev@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-xlib>0:x11-toolkits/py-python-xlib@${PY_FLAVOR}
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=1.3.1:textproc/py-sphinx@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}twine>=4.0:devel/py-twine@${PY_FLAVOR} \
 		${PY_DEPENDS}
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		python
-USE_PYTHON=	distutils autoplist
+USE_PYTHON=	distutils autoplist pytest # PyTest doesn't run tests because test file names don't begin with test_, see https://github.com/moses-palmer/pynput/issues/618
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	moses-palmer
 
 NO_ARCH=	yes
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 TEST_WRKSRC=	${WRKSRC}/tests
 
 .include <bsd.port.mk>
diff --git a/x11/py-pynput/distinfo b/x11/py-pynput/distinfo
index 28f824a43120..cee79ce04643 100644
--- a/x11/py-pynput/distinfo
+++ b/x11/py-pynput/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1675195033
-SHA256 (pynput-1.7.6.tar.gz) = 3a5726546da54116b687785d38b1db56997ce1d28e53e8d22fc656d8b92e533c
-SIZE (pynput-1.7.6.tar.gz) = 79501
+TIMESTAMP = 1734384955
+SHA256 (moses-palmer-pynput-v1.7.7_GH0.tar.gz) = e042e70933938b3b1226aee936d60acf03f43d52e83d7abbd728e8bab2deeacd
+SIZE (moses-palmer-pynput-v1.7.7_GH0.tar.gz) = 92710
diff --git a/x11/py-pynput/files/patch-setup.py b/x11/py-pynput/files/patch-setup.py
index cdb4058e3afd..612030d686de 100644
--- a/x11/py-pynput/files/patch-setup.py
+++ b/x11/py-pynput/files/patch-setup.py
@@ -1,16 +1,13 @@
 - setuptools-lint isn't really needed during build
 
---- setup.py.orig	2022-01-01 19:56:27 UTC
+--- setup.py.orig	2024-05-10 13:18:06 UTC
 +++ setup.py
-@@ -23,8 +23,9 @@ SETUP_PACKAGES = [
+@@ -23,8 +23,6 @@ SETUP_PACKAGES = [
  
  #: Additional requirements used during setup
  SETUP_PACKAGES = [
 -    'setuptools-lint >=0.5',
--    'sphinx >=1.3.1']
-+    #'setuptools-lint >=0.5',
-+    #'sphinx >=1.3.1']
-+    ]
+-    'sphinx >=1.3.1',
+     'twine >=4.0']
  
  #: Packages requires for different environments
- EXTRA_PACKAGES = {