diff --git a/net/rdesktop/Makefile b/net/rdesktop/Makefile
index 7230a429ebe1..957984ab67b4 100644
--- a/net/rdesktop/Makefile
+++ b/net/rdesktop/Makefile
@@ -1,56 +1,56 @@
 # New ports collection makefile for:  rdesktop
 # Date created:               13 December 2000
 # Whom:                       mwest@uct.ac.za
 #
 # $FreeBSD$
 #
 
 PORTNAME=	rdesktop
 PORTVERSION=	1.6.0
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	net comms ipv6
 MASTER_SITES=	SF
 
 MAINTAINER=	obrien@FreeBSD.org
 COMMENT=	RDP client for Windows NT/2000/2003 Terminal Server
 
 USE_XORG=	x11
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 DOCS=		doc/AUTHORS doc/TODO doc/*.txt
 MAN1=		rdesktop.1
 
 .if !defined(WITHOUT_RDESKTOP_IPV6) && !defined(WITHOUT_IPV6)
 CONFIGURE_ARGS+=	--with-ipv6
 .endif
 
 .if defined(WITH_ICONV)
 USE_ICONV=	yes
 CONFIGURE_ARGS+=	--with-libiconv-prefix=${LOCALBASE}
 .endif
 
 .if defined(WITH_RDESKTOP_DEBUG)
 CONFIGURE_ARGS+=	--with-debug\
 			--with-debug-kbd\
 			--with-debug-rdp5\
 			--with-debug-clipboard\
 			--with-debug-sound\
 			--with-debug-channel\
 			--with-debug-seamless
 
 post-configure:
 	${ECHO} "#define WITH_DEBUG_SERIAL 1" >> ${WRKSRC}/rdesktop.h
 .endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/rdesktop ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/doc/rdesktop.1 ${MAN1PREFIX}/man/man1
 	@${MKDIR} ${DATADIR}/keymaps
 	${INSTALL_DATA} ${WRKSRC}/keymaps/* ${DATADIR}/keymaps
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/rdesktop/files/patch-rdpdr.c b/net/rdesktop/files/patch-rdpdr.c
new file mode 100644
index 000000000000..8383a0a858ae
--- /dev/null
+++ b/net/rdesktop/files/patch-rdpdr.c
@@ -0,0 +1,9 @@
+--- rdpdr.c.orig	2008-02-14 03:37:17.000000000 -0800
++++ rdpdr.c	2010-09-09 12:56:03.000000000 -0700
+@@ -842,5 +842,5 @@ RD_BOOL
+ rdpdr_init()
+ {
+-	if (g_num_devices > 0)
++//	if (g_num_devices > 0)
+ 	{
+ 		rdpdr_channel =