diff --git a/security/pssh/Makefile b/security/pssh/Makefile
index 23aa6738556b..233507c67e56 100644
--- a/security/pssh/Makefile
+++ b/security/pssh/Makefile
@@ -1,21 +1,21 @@
 # $FreeBSD$
 
 PORTNAME=	pssh
 PORTVERSION=	2.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security net sysutils
 MASTER_SITES=	CHEESESHOP
 
-MAINTAINER=	brooks@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Parallel versions of the openssh tools
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	rsync:net/rsync
 
 NO_ARCH=	yes
 USES=		python
 USE_PYTHON=	autoplist distutils concurrent optsuffix
 
 .include <bsd.port.mk>
diff --git a/security/pssh/files/patch-psshlib_cli.py b/security/pssh/files/patch-psshlib_cli.py
new file mode 100644
index 000000000000..6f628152573b
--- /dev/null
+++ b/security/pssh/files/patch-psshlib_cli.py
@@ -0,0 +1,11 @@
+--- psshlib/cli.py.orig
++++ psshlib/cli.py
+@@ -6,7 +6,7 @@
+ import shlex
+ import sys
+ import textwrap
+-import version
++from psshlib import version
+ 
+ _DEFAULT_PARALLELISM = 32
+ _DEFAULT_TIMEOUT     = 0 # "infinity" by default
diff --git a/security/pssh/files/patch-psshlib_manager.py b/security/pssh/files/patch-psshlib_manager.py
new file mode 100644
index 000000000000..33d8e478cd5a
--- /dev/null
+++ b/security/pssh/files/patch-psshlib_manager.py
@@ -0,0 +1,18 @@
+--- psshlib/manager.py.orig
++++ psshlib/manager.py
+@@ -2,6 +2,7 @@
+ 
+ from errno import EINTR
+ import os
++import fcntl
+ import select
+ import signal
+ import sys
+@@ -209,6 +210,7 @@
+ 
+         # Setup the wakeup file descriptor to avoid hanging on lost signals.
+         wakeup_readfd, wakeup_writefd = os.pipe()
++        fcntl.fcntl(wakeup_writefd, fcntl.F_SETFL, os.O_NONBLOCK)
+         self.register_read(wakeup_readfd, self.wakeup_handler)
+         # TODO: remove test when we stop supporting Python <2.5
+         if hasattr(signal, 'set_wakeup_fd'):