Index: devel/py-cuisine/Makefile
===================================================================
--- devel/py-cuisine/Makefile
+++ devel/py-cuisine/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	cuisine
 PORTVERSION=	0.7.13
+PORTREVISION=	1
 #PORTEPOCH=	0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
@@ -12,7 +13,7 @@
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fabric>=1.7,1:devel/py-fabric@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fabric1>=1.7,1:devel/py-fabric1@${PY_FLAVOR}
 
 USES=		python:2.7
 USE_PYTHON=	distutils autoplist
Index: devel/py-fabric1/Makefile
===================================================================
--- devel/py-fabric1/Makefile
+++ devel/py-fabric1/Makefile
@@ -7,10 +7,11 @@
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX=	1
 DISTNAME=	Fabric-${DISTVERSION}
 
 MAINTAINER=	koobs@FreeBSD.org
-COMMENT=	Simple, Pythonic remote execution and deployment
+COMMENT=	High level SSH command execution
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -22,6 +23,8 @@
 
 USES=		python:2.7
 USE_PYTHON=	distutils concurrent autoplist
+
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}fabric
 
 NO_ARCH=	yes
 
Index: devel/py-fabric1/pkg-descr
===================================================================
--- devel/py-fabric1/pkg-descr
+++ devel/py-fabric1/pkg-descr
@@ -1,10 +1,8 @@
-Fabric is a simple pythonic remote deployment tool.
+Fabric is a high level Python library designed to execute shell commands
+remotely over SSH, yielding useful Python objects in return.
 
-It is designed to upload files to, and run shell commands on, a number
-of servers in parallel or serially. These commands are grouped in tasks
-(regular python functions) and specified in a 'fabfile.'
-
-This is called remote automation, and the primary use case is deploying
-applications to multiple similar hosts.
+It builds on top of Invoke (subprocess command execution and command-line
+features) and Paramiko (SSH protocol implementation), extending their APIs
+to complement one another and provide additional functionality.
 
 WWW: https://www.fabfile.org
Index: sysutils/py-ezjailremote/Makefile
===================================================================
--- sysutils/py-ezjailremote/Makefile
+++ sysutils/py-ezjailremote/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ezjailremote
 PORTVERSION=	0.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -13,13 +13,15 @@
 LICENSE=	BSD2CLAUSE
 
 RUN_DEPENDS=	ezjail-admin:sysutils/ezjail \
-		${PYTHON_PKGNAMEPREFIX}fabric>0:devel/py-fabric@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}fabric1>0:devel/py-fabric1@${PY_FLAVOR}
 
+USES=		python:2.7
+USE_PYTHON=	distutils autoplist
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	tomster
 GH_PROJECT=	ezjail-remote
 
-USES=		python:2.7
-USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
Index: sysutils/py-ploy_fabric/Makefile
===================================================================
--- sysutils/py-ploy_fabric/Makefile
+++ sysutils/py-ploy_fabric/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ploy_fabric
 DISTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,9 +15,11 @@
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:sysutils/py-ploy@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}fabric>=1.4.0,1:devel/py-fabric@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}fabric1>=1.4.0,1:devel/py-fabric1@${PY_FLAVOR}
 
 USES=		python:-2.7 zip
 USE_PYTHON=	autoplist distutils
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>