diff --git a/devel/pcsc-lite/Makefile b/devel/pcsc-lite/Makefile
index 8564088141bb..39c8c31d3ea0 100644
--- a/devel/pcsc-lite/Makefile
+++ b/devel/pcsc-lite/Makefile
@@ -6,21 +6,33 @@
 #
 
 PORTNAME=	pcsc-lite
-PORTVERSION=	1.0.1
+PORTVERSION=	1.0.2.b2
 CATEGORIES=	devel security
 MASTER_SITES=	http://www.linuxnet.com/middleware/files/
+DISTNAME=	pcsc-lite-${PORTVERSION:S/b/beta/}
 
 MAINTAINER=	toni@ants.at
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
+LIBTOOLFILES+=	build/aclocal.m4
 
 INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS+=	--enable-syslog --enable-daemon
+CONFIGURE_ARGS+=	--enable-syslog --enable-daemon \
+			--enable-runpid=/var/run/pcscd.pid
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
+post-patch:
+	@${PERL} -pi -e 's,SUBDIRS = src etc doc,SUBDIRS = src,' \
+		${WRKSRC}/Makefile.in
+
 post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/README.DAEMON ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/pcsc-lite-0.8.7.pdf ${DOCSDIR}
+.endif
 	${INSTALL_DATA} ${WRKSRC}/etc/reader.conf \
 		${PREFIX}/etc/reader.conf.sample
 	${INSTALL_SCRIPT} ${FILESDIR}/pcscd.sh \
diff --git a/devel/pcsc-lite/distinfo b/devel/pcsc-lite/distinfo
index 121229247ef7..b2a4e3a0ab5f 100644
--- a/devel/pcsc-lite/distinfo
+++ b/devel/pcsc-lite/distinfo
@@ -1 +1 @@
-MD5 (pcsc-lite-1.0.1.tar.gz) = 519f86b5cdddd7bfb9ab6330dd8966b3
+MD5 (pcsc-lite-1.0.2.beta2.tar.gz) = 09d469948775baa4fdb8c2636db99eee
diff --git a/devel/pcsc-lite/files/patch-etc::Makefile.in b/devel/pcsc-lite/files/patch-etc::Makefile.in
deleted file mode 100644
index 7db3876b4185..000000000000
--- a/devel/pcsc-lite/files/patch-etc::Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
-$FreeBSD$
-
---- etc/Makefile.in.dist	Thu Nov  8 02:58:55 2001
-+++ etc/Makefile.in	Thu Nov  8 02:59:36 2001
-@@ -74,5 +74,5 @@
- 
--sysconf_DATA = reader.conf
-+sysconf_DATA =
- 
--EXTRA_DIST = reader.conf StartupParameters.plist SmartcardServices
-+EXTRA_DIST = StartupParameters.plist SmartcardServices
- mkinstalldirs = $(SHELL) $(top_srcdir)/build/mkinstalldirs
diff --git a/devel/pcsc-lite/files/patch-ltmain.sh b/devel/pcsc-lite/files/patch-ltmain.sh
new file mode 100644
index 000000000000..fc364420a9a0
--- /dev/null
+++ b/devel/pcsc-lite/files/patch-ltmain.sh
@@ -0,0 +1,27 @@
+$FreeBSD$
+
+--- build/ltmain.sh	2001/08/27 09:51:26	1.1
++++ build/ltmain.sh	2001/08/27 09:51:42
+@@ -2408,6 +2408,9 @@
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test "$build_libtool_need_lc" = "yes"; then
+@@ -4175,10 +4178,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/devel/pcsc-lite/files/patch-src::dyn_bsd.c b/devel/pcsc-lite/files/patch-src::dyn_bsd.c
index de6af7c8d122..0000a7a38cbd 100644
--- a/devel/pcsc-lite/files/patch-src::dyn_bsd.c
+++ b/devel/pcsc-lite/files/patch-src::dyn_bsd.c
@@ -1,6 +1,6 @@
---- src/dyn_bsd.c.dist	Thu Nov  8 16:40:00 2001
-+++ src/dyn_bsd.c	Thu Nov  8 16:40:21 2001
-@@ -74,3 +74,3 @@
+--- src/dyn_bsd.c.dist	Wed Dec 26 06:37:11 2001
++++ src/dyn_bsd.c	Wed Dec 26 06:39:24 2001
+@@ -77,3 +77,3 @@
    *pvFHandle = 0;
 -  *pvFHandle = dlsym( pvLHandle, pcFunctionName );
 +  *pvFHandle = dlsym( pvLHandle, pcFunction );
diff --git a/devel/pcsc-lite/pkg-plist b/devel/pcsc-lite/pkg-plist
index b8912f11c81e..6f0590f602b7 100644
--- a/devel/pcsc-lite/pkg-plist
+++ b/devel/pcsc-lite/pkg-plist
@@ -1,3 +1,7 @@
+bin/formaticc
+bin/installifd
+%%PORTDOCS%%share/doc/pcsc-lite/README.DAEMON
+%%PORTDOCS%%share/doc/pcsc-lite/pcsc-lite-0.8.7.pdf
 etc/rc.d/pcscd.sh.sample
 etc/reader.conf.sample
 include/atrhandler.h
@@ -17,10 +21,8 @@ include/winscard.h
 include/winscard_msg.h
 include/winscard_svc.h
 include/wintypes.h
-lib/libpcsclite-core.a
-lib/libpcsclite-core.so
-lib/libpcsclite-core.so.0
 lib/libpcsclite.a
 lib/libpcsclite.so
 lib/libpcsclite.so.0
 sbin/pcscd
+%%PORTDOCS%%@dirrm share/doc/pcsc-lite