diff --git a/devel/pcsc-lite/Makefile b/devel/pcsc-lite/Makefile
index a8d2d5cd4bfc..d53e6c587792 100644
--- a/devel/pcsc-lite/Makefile
+++ b/devel/pcsc-lite/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	pcsc-lite
-PORTVERSION=	1.8.3
+PORTVERSION=	1.8.5
 PORTEPOCH=	2
 CATEGORIES=	devel security
-MASTER_SITES=	https://alioth.debian.org/frs/download.php/3706/
+MASTER_SITES=	https://alioth.debian.org/frs/download.php/3741/
 
 MAINTAINER=	arved@FreeBSD.org
 COMMENT=	A smartcard development library
@@ -38,19 +38,11 @@ MAN8=		pcscd.8
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 800069
-OPTIONS_DEFINE=	USB
-OPTIONS_DEFAULT=USB
-
-USB_DESC=	Support for USB-reader
-
-.if $(PORT_OPTIONS:MUSB)
-CONFIGURE_ENV+= LIBUSB_LIBS="-lusb"
+.if !defined(WITHOUT_USB) && ${OSVERSION} >= 800069
+CONFIGURE_ENV+=	LIBUSB_LIBS="-lusb"
 CONFIGURE_ARGS+=--enable-libusb=/usr
 .else
-CONFIGURE_ARGS+=--disable-libusb
-.endif
-
+BROKEN=		FreeBSD 7.x does not ship with a supported libusb
 .endif
 
 post-patch:
@@ -64,6 +56,14 @@ post-patch:
 	${REINPLACE_CMD} -e '/^install-data-am: / s|install-docDATA||' ${WRKSRC}/doc/Makefile.in
 .endif
 
+pre-everything::
+.if !defined(WITHOUT_USB) && ${OSVERSION} >= 800069
+	@${ECHO_MSG}
+	@${ECHO_MSG} "pcsc-lite has the following option(s):"
+	@${ECHO_MSG} "  WITHOUT_USB=yes            Disable USB support"
+	@${ECHO_MSG}
+.endif
+
 post-install:
 .if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
diff --git a/devel/pcsc-lite/distinfo b/devel/pcsc-lite/distinfo
index bf5c97a52004..c66e01a3b8e6 100644
--- a/devel/pcsc-lite/distinfo
+++ b/devel/pcsc-lite/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pcsc-lite-1.8.3.tar.bz2) = b4442d76e9d033340844fb419783f4ee4817dc8d0e5ff208991bb0be1db45d73
-SIZE (pcsc-lite-1.8.3.tar.bz2) = 552100
+SHA256 (pcsc-lite-1.8.5.tar.bz2) = 917f6c24d2a766cc7b20ad78b70f29613f134dea997d60613826a9ce68eee6a6
+SIZE (pcsc-lite-1.8.5.tar.bz2) = 560995
diff --git a/devel/pcsc-lite/files/pkg-message.in b/devel/pcsc-lite/files/pkg-message.in
index 16e96295b2c3..95cf2252b344 100644
--- a/devel/pcsc-lite/files/pkg-message.in
+++ b/devel/pcsc-lite/files/pkg-message.in
@@ -4,7 +4,6 @@ PC/SC-Lite has been installed.
 You can fetch drivers from http://www.linuxnet.com/sourcedrivers.html
 or install one of the following ports:
 devel/libccid
-security/ifd-gempc410
 security/ifd-slb_rf60
 
 For cardreaders connected to the serial port: After installing the driver,