diff --git a/sysutils/duplicity/Makefile b/sysutils/duplicity/Makefile
index 43ae4acf52f0..842caf934095 100644
--- a/sysutils/duplicity/Makefile
+++ b/sysutils/duplicity/Makefile
@@ -1,130 +1,130 @@
 # New ports collection makefile for:	duplicity
 # Date created:				Wed Jun 11 19:53:46 CEST 2003
 # Whom:					Gerhard Häring <gh@ghaering.de>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	duplicity
 PORTVERSION=	0.6.19
-PORTREVISION=	1
+PORTREVISION=	2	
 CATEGORIES=	sysutils
 MASTER_SITES=	http://launchpad.net/duplicity/0.6-series/${PORTVERSION}/+download/
 
 MAINTAINER=	jase@FreeBSD.org
 COMMENT=	Backup tool that uses librsync and GnuPG
 
 LIB_DEPENDS=	rsync:${PORTSDIR}/net/librsync
 RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
 
 FETCH_ARGS=	-pRr
 
 CONFLICTS=	duplicity-0.5.* duplicity-devel-[0-9]*
 
 USE_PYTHON=	2.5+
 USE_PYDISTUTILS=yes
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	NLS DOCS SSH FTP FTPS S3 GDOCS CLOUDFILES
 OPTIONS_DEFAULT=SSH FTP FTPS S3
 CLOUDFILES_DESC=Install CloudFiles backend
 FTP_DESC=	Install FTP backend
 FTPS_DESC=	Install FTPS backend
 GDOCS_DESC=	Install Google Docs backend
 S3_DESC=	Install Amazon S3 backend
 SSH_DESC=	Install SSH/SCP/SFTP backend
 
 .include "bsd.port.options.mk"
 
 .if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSSH}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}paramiko>=1.7.7.1:${PORTSDIR}/security/py-paramiko
 PLIST_SUB+=	SSH=""
 .else
 PLIST_SUB+=	SSH="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFTP}
 RUN_DEPENDS+=	ncftp>=3.2.2:${PORTSDIR}/ftp/ncftp3
 PLIST_SUB+=	FTP=""
 .else
 PLIST_SUB+=	FTP="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MFTPS}
 RUN_DEPENDS+=	lftp>=3.7.15:${PORTSDIR}/ftp/lftp
 PLIST_SUB+=	FTPS=""
 .else
 PLIST_SUB+=	FTPS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MS3}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}boto>=1.6b:${PORTSDIR}/devel/py-boto
 PLIST_SUB+=	S3=""
 .else
 PLIST_SUB+=	S3="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGDOCS}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}gdata>0:${PORTSDIR}/devel/py-gdata
 PLIST_SUB+=	GDOCS=""
 .else
 PLIST_SUB+=	GDOCS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCLOUDFILES}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cloudfiles>0:${PORTSDIR}/net/py-cloudfiles
 PLIST_SUB+=	CLOUDFILES=""
 .else
 PLIST_SUB+=	CLOUDFILES="@comment "
 .endif
 
 post-patch:
 .if empty(PORT_OPTIONS:MNLS)
 	@${REINPLACE_CMD} -e '54,62d' \
 		${WRKSRC}/setup.py
 .endif
 .if empty(PORT_OPTIONS:MSSH)
 	@${FIND} ${WRKSRC}/${PORTNAME}/backends -type f -depth 1 -name '*ssh*' -delete
 .endif
 .if empty(PORT_OPTIONS:MFTP)
 	@${RM} -f ${WRKSRC}/${PORTNAME}/backends/ftpbackend.py
 .endif
 .if empty(PORT_OPTIONS:MFTPS)
 	@${RM} -f ${WRKSRC}/${PORTNAME}/backends/ftpsbackend.py
 .endif
 .if empty(PORT_OPTIONS:MS3)
 	@${FIND} ${WRKSRC}/${PORTNAME}/backends -type f -depth 1 -name '*boto*' -delete
 .endif
 .if empty(PORT_OPTIONS:MGDOCS)
 	@${RM} -f ${WRKSRC}/${PORTNAME}/backends/gdocsbackend.py
 .endif
 .if empty(PORT_OPTIONS:MCLOUDFILES)
 	@${RM} -f ${WRKSRC}/${PORTNAME}/backends/cloudfilesbackend.py
 .endif
 
 MAN1=		duplicity.1 rdiffdir.1
 
 DOCFILES=	COPYING \
 		README \
 		README-REPO \
 		README-LOG \
 		tarfile-LICENSE \
 		tarfile-CHANGES \
 		CHANGELOG
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for file in ${DOCFILES}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/duplicity/files/patch-bin-duplicity b/sysutils/duplicity/files/patch-bin-duplicity
new file mode 100644
index 000000000000..05ad6e5a6bb9
--- /dev/null
+++ b/sysutils/duplicity/files/patch-bin-duplicity
@@ -0,0 +1,11 @@
+--- bin/duplicity.orig	2012-05-22 15:58:53.000000000 +0100
++++ bin/duplicity	2012-08-12 14:32:01.920372871 +0100
+@@ -321,6 +321,8 @@
+ 
+         # Settings are same, let's check passphrase itself if we are encrypted
+         if globals.encryption:
++            if not globals.gpg_profile.passphrase:
++                globals.gpg_profile.passphrase = get_passphrase(1, "verify")
+             fileobj = restore_get_enc_fileobj(globals.backend, vol1_filename,
+                                               manifest.volume_info_dict[1])
+             fileobj.close()