diff --git a/.cvsignore b/.cvsignore
index e69de29..745a62b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+opensc-0.9.4.tar.gz
diff --git a/opensc-build.patch b/opensc-build.patch
new file mode 100644
index 0000000..1f8b5a5
--- /dev/null
+++ b/opensc-build.patch
@@ -0,0 +1,161 @@
+Index: configure.in
+===================================================================
+RCS file: /pub/cvsroot/opensc/configure.in,v
+retrieving revision 1.133
+diff -a -u -r1.133 configure.in
+--- configure.in	5 Aug 2004 22:27:11 -0000	1.133
++++ configure.in	3 Nov 2004 17:04:38 -0000
+@@ -241,7 +241,7 @@
+ AC_SUBST(ENGINE_LINK)
+ AC_CACHE_CHECK([for OpenSSL directory], ac_cv_openssldir, [
+ 	if test "x$tryssldir" = "x" ; then
+-		tryssldir="$trycommandir /usr/ /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl"
++		tryssldir="$trycommondir /usr /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl"
+ 	fi
+ 
+ 	for ssldir in $tryssldir ; do
+@@ -316,11 +316,11 @@
+ }
+ 		],
+ 		[
+-			AC_MSG_RESULT("good, 0.9.7d or later")
++			AC_MSG_RESULT([good, 0.9.7d or later])
+ 			GOOD_OPENSSL=yes
+ 		],
+ 		[
+-			AC_MSG_RESULT("not so good, 0.9.7d or later woudl be better")
++			AC_MSG_RESULT([not so good, 0.9.7d or later would be better])
+ 			GOOD_OPENSSL=no
+ 		]
+ 		)
+@@ -406,11 +406,13 @@
+ 
+ if test "x$SSL_MSG" = "xyes" ; then
+   AC_DEFINE(HAVE_OPENSSL, 1, [Have OpenSSL libraries])
+-  LDFLAGS="-L$ac_cv_openssldir/lib $LDFLAGS"
+-  if test ! -z "$need_dash_r" ; then
++  if test "x$ac_cv_openssldir" != "x/usr"; then
++    LDFLAGS="-L$ac_cv_openssldir/lib $LDFLAGS"
++    if test ! -z "$need_dash_r" ; then
+        LDFLAGS="-R$ac_cv_openssldir/lib $LDFLAGS"
++    fi
++    CPPFLAGS="-I$ac_cv_openssldir/include $saved_CPPFLAGS"
+   fi
+-  CPPFLAGS="-I$ac_cv_openssldir/include $saved_CPPFLAGS"
+ else
+   LIBCRYPTO=""
+   LIBCRYPTOA=""
+Index: src/libopensc/Makefile.am
+===================================================================
+RCS file: /pub/cvsroot/opensc/src/libopensc/Makefile.am,v
+retrieving revision 1.79
+diff -a -u -r1.79 Makefile.am
+--- src/libopensc/Makefile.am	27 Oct 2004 06:41:27 -0000	1.79
++++ src/libopensc/Makefile.am	3 Nov 2004 17:04:39 -0000
+@@ -7,7 +7,7 @@
+ EXTRA_DIST = Makefile.mak libopensc.pc.in
+ 
+ INCLUDES = @CPPFLAGS@ @OPENCT_CFLAGS@ @PCSC_CFLAGS@
+-LDFLAGS = @LDFLAGS@ @OPENCT_LDFLAGS@
++AM_LDFLAGS = @OPENCT_LDFLAGS@
+ 
+ bin_SCRIPTS = opensc-config
+ 
+Index: src/openscd/Makefile.am
+===================================================================
+RCS file: /pub/cvsroot/opensc/src/openscd/Makefile.am,v
+retrieving revision 1.9
+diff -a -u -r1.9 Makefile.am
+--- src/openscd/Makefile.am	30 Jul 2003 09:50:17 -0000	1.9
++++ src/openscd/Makefile.am	3 Nov 2004 17:04:39 -0000
+@@ -5,7 +5,7 @@
+ EXTRA_DIST = test.c
+ 
+ INCLUDES = @CPPFLAGS@ @CFLAGS_ASSUAN@
+-LDFLAGS = @LDFLAGS@ @LIBOPENSC@
++AM_LDFLAGS = @LIBOPENSC@
+ 
+ if HAVE_ASSUAN
+ noinst_PROGRAMS = openscd
+Index: src/pam/Makefile.am
+===================================================================
+RCS file: /pub/cvsroot/opensc/src/pam/Makefile.am,v
+retrieving revision 1.31
+diff -a -u -r1.31 Makefile.am
+--- src/pam/Makefile.am	22 Dec 2003 22:07:02 -0000	1.31
++++ src/pam/Makefile.am	3 Nov 2004 17:04:39 -0000
+@@ -6,7 +6,7 @@
+ 
+ INCLUDES = @CPPFLAGS@ -I${top_srcdir}/src/scam
+ 
+-LDFLAGS = @LDFLAGS@ ${top_builddir}/src/scam/libscam.la
++AM_LDFLAGS = ${top_builddir}/src/scam/libscam.la
+ 
+ if HAVE_PAM
+ lib_LTLIBRARIES = pam_opensc.la
+Index: src/pkcs15init/Makefile.am
+===================================================================
+RCS file: /pub/cvsroot/opensc/src/pkcs15init/Makefile.am,v
+retrieving revision 1.29
+diff -a -u -r1.29 Makefile.am
+--- src/pkcs15init/Makefile.am	16 Jun 2004 20:59:59 -0000	1.29
++++ src/pkcs15init/Makefile.am	3 Nov 2004 17:04:40 -0000
+@@ -4,8 +4,8 @@
+ 
+ MAINTAINERCLEANFILES = Makefile.in
+ 
+-CFLAGS = @CFLAGS@ -DSC_PKCS15_PROFILE_DIRECTORY=\"$(pkgdatadir)\"
+-LDFLAGS = @LDFLAGS@ @LIBOPENSC@
++AM_CFLAGS = -DSC_PKCS15_PROFILE_DIRECTORY=\"$(pkgdatadir)\"
++AM_LDFLAGS = @LIBOPENSC@
+ 
+ PROFILES = \
+ 	cyberflex.profile \
+Index: src/sia/Makefile.am
+===================================================================
+RCS file: /pub/cvsroot/opensc/src/sia/Makefile.am,v
+retrieving revision 1.13
+diff -a -u -r1.13 Makefile.am
+--- src/sia/Makefile.am	30 Jul 2003 09:50:17 -0000	1.13
++++ src/sia/Makefile.am	3 Nov 2004 17:04:40 -0000
+@@ -6,7 +6,7 @@
+ 
+ INCLUDES = @CPPFLAGS@ -I${top_srcdir}/src/scam
+ 
+-LDFLAGS = @LDFLAGS@ @LIBDL@ ${top_builddir}/src/scam/libscam.la
++AM_LDFLAGS = @LIBDL@ ${top_builddir}/src/scam/libscam.la
+ 
+ SRC = sia_opensc.c sia_support.c sia_support.h
+ 
+Index: src/tests/Makefile.am
+===================================================================
+RCS file: /pub/cvsroot/opensc/src/tests/Makefile.am,v
+retrieving revision 1.19
+diff -a -u -r1.19 Makefile.am
+--- src/tests/Makefile.am	30 Jul 2003 09:50:18 -0000	1.19
++++ src/tests/Makefile.am	3 Nov 2004 17:04:40 -0000
+@@ -6,7 +6,7 @@
+ 
+ EXTRA_DIST = Makefile.mak
+ 
+-LDFLAGS = @LDFLAGS@ @LIBOPENSC@
++AM_LDFLAGS = @LIBOPENSC@
+ 
+ noinst_PROGRAMS = base64 lottery p15dump pintest prngtest
+ 
+Index: src/tools/Makefile.am
+===================================================================
+RCS file: /pub/cvsroot/opensc/src/tools/Makefile.am,v
+retrieving revision 1.35
+diff -a -u -r1.35 Makefile.am
+--- src/tools/Makefile.am	21 Jul 2004 22:02:37 -0000	1.35
++++ src/tools/Makefile.am	3 Nov 2004 17:04:41 -0000
+@@ -4,7 +4,7 @@
+ 
+ EXTRA_DIST = Makefile.mak
+ 
+-LDFLAGS = @LDFLAGS@ @LIBOPENSC@
++AM_LDFLAGS = @LIBOPENSC@
+ 
+ if HAVE_SSL
+ PROGRAMS_SSL = cryptoflex-tool pkcs15-init
diff --git a/opensc.spec b/opensc.spec
new file mode 100644
index 0000000..b50a928
--- /dev/null
+++ b/opensc.spec
@@ -0,0 +1,247 @@
+# There's something in the opensc static libs that strip(1) invoked in the
+# end of %%install doesn't grok.  Hence, disabled for now.
+%define disable_static 1
+
+%define plugindir %{_libdir}/mozilla/plugins
+
+Name:           opensc
+Version:        0.9.4
+Release:        1
+Summary:        OpenSC SmartCard library and applications
+
+Group:          System Environment/Libraries
+License:        LGPL
+URL:            http://www.opensc.org/
+Source0:        http://www.opensc.org/files/opensc-0.9.4.tar.gz
+Patch0:         %{name}-build.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  pcsc-lite-devel >= 1.1.1 flex pam-devel openldap-devel
+BuildRequires:  readline-devel libtermcap-devel openct-devel
+BuildRequires:  openssl-devel >= 0.9.7a libassuan-devel XFree86-devel
+# libtool (+ pulled in automake and autoconf) for patch0
+BuildRequires:  libtool
+Requires:       openct
+
+%description
+OpenSC is a package for for accessing SmartCard devices.  Basic
+functionality (e.g. SELECT FILE, READ BINARY) should work on any ISO
+7816-4 compatible SmartCard.  Encryption and decryption using private
+keys on the SmartCard is possible with PKCS #15 compatible cards, such
+as the FINEID (Finnish Electronic IDentity) card. Swedish Posten eID
+cards have also been confirmed to work.
+
+%package     -n mozilla-opensc-signer
+Summary:        Digital signature plugin for web browsers
+Group:          Applications/Internet
+Requires:       %{plugindir} pinentry
+
+%description -n mozilla-opensc-signer
+OpenSC Signer is a plugin for web browsers compatible with Mozilla
+plugins that will generate digital signatures using facilities on
+PKI-capable smartcards.
+
+%package        pam
+Summary:        OpenSC pluggable authentication module
+Group:          System Environment/Base
+Provides:       pam_opensc = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
+
+%description    pam
+OpenSC pluggable authentication module implementing smart card support.
+
+%package        devel
+Summary:        OpenSC development files
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release} pkgconfig
+Requires:       %{name}-pam = %{version}-%{release}
+
+%description    devel
+OpenSC development files.
+
+
+%prep
+%setup -q
+%patch0 -p0
+cp -p src/pkcs15init/README ./README.pkcs15init
+cp -p src/scconf/README.scconf .
+for file in docs/*.1 ; do
+  iconv -f iso-8859-1 -t utf-8 $file > $file.utf-8 ; mv $file.utf-8 $file
+done
+sh ./bootstrap # for patch0
+
+
+%build
+%configure --disable-dependency-tracking \
+%if %{disable_static}
+  --disable-static \
+%endif
+  --with-plugin-path=%{plugindir} \
+  --with-pin-entry=%{_bindir}/pinentry
+make %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT _docs
+make install DESTDIR=$RPM_BUILD_ROOT
+
+# Fixup pam module location.
+install -dm 755 $RPM_BUILD_ROOT/%{_lib}/security
+mv $RPM_BUILD_ROOT%{_libdir}/security/pam_opensc.so \
+  $RPM_BUILD_ROOT/%{_lib}/security/pam_opensc.so
+rm -rf $RPM_BUILD_ROOT%{_libdir}/security
+
+# Installing config examples as doc later.
+install -dm 755 _docs/openssh
+mv $RPM_BUILD_ROOT%{_datadir}/opensc/*.conf.example _docs
+install -pm 644 src/openssh/README src/openssh/ask-for-pin.diff _docs/openssh
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post -p /sbin/ldconfig
+%post pam -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+%postun pam -p /sbin/ldconfig
+
+
+%files
+%defattr(-,root,root,-)
+%doc ANNOUNCE AUTHORS ChangeLog COPYING NEWS QUICKSTART README.*
+%doc docs/*.html docs/*.css _docs/*.conf.example
+%{_bindir}/cardos-info
+%{_bindir}/cryptoflex-tool
+%{_bindir}/opensc-explorer
+%{_bindir}/opensc-tool
+%{_bindir}/pkcs11-tool
+%{_bindir}/pkcs15-crypt
+%{_bindir}/pkcs15-init
+%{_bindir}/pkcs15-tool
+%{_libdir}/libopensc.so.*
+%{_libdir}/libpkcs15init.so.*
+%{_libdir}/libscconf.so.*
+%{_libdir}/libscldap.so.*
+%dir %{_libdir}/opensc
+%{!?_with_oldssl:%{_libdir}/opensc/engine_*.so}
+%dir %{_libdir}/pkcs11
+%{_libdir}/pkcs11/opensc-pkcs11.so
+%{_libdir}/pkcs11/lib*.so.*
+%{_datadir}/opensc
+%{_mandir}/man1/cardos-info.*
+%{_mandir}/man1/cryptoflex-tool.*
+%{_mandir}/man1/opensc-explorer.*
+%{_mandir}/man1/opensc-tool.*
+%{_mandir}/man1/pkcs11-tool.*
+%{_mandir}/man1/pkcs15-crypt.*
+%{_mandir}/man1/pkcs15-init.*
+%{_mandir}/man1/pkcs15-tool.*
+%{_mandir}/man[57]/*.[57]*
+
+%files -n mozilla-opensc-signer
+%defattr(0755,root,root,0755)
+%{plugindir}/opensc-signer.so
+%{_libdir}/opensc/opensc-signer.so
+
+%files pam
+%defattr(-,root,root,-)
+%doc PAM_README
+/%{_lib}/security/pam_opensc.so
+%{_libdir}/libscam.so.*
+
+%files devel
+%defattr(-,root,root,-)
+%doc CodingStyle _docs/openssh
+%{_bindir}/opensc-config
+%{_includedir}/opensc
+%exclude %{_libdir}/*.la
+%{_libdir}/libopensc.so
+%{_libdir}/libpkcs15init.so
+%{_libdir}/libscam.so
+%{_libdir}/libscconf.so
+%{_libdir}/libscldap.so
+%exclude %{_libdir}/opensc/*.la
+%{_libdir}/pkcs11/pkcs11-spy.so
+%{_libdir}/pkcs11/lib*.so
+%exclude %{_libdir}/pkcs11/*.la
+%{_libdir}/pkgconfig/libopensc.pc
+%{_mandir}/man1/opensc-config.1*
+%{_mandir}/man3/*.3*
+%if !%{disable_static}
+%{_libdir}/*.a
+%{_libdir}/opensc/*.a
+%{_libdir}/pkcs11/lib*.a
+%endif
+
+
+%changelog
+* Thu Feb  3 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.9.4-1
+- Drop unnecessary Epochs, pre-FC1 compat cruft, and no longer relevant
+  --with(out) rpmbuild options.
+- Exclude *.la.
+
+* Wed Nov  3 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.9.4-0.fdr.1
+- Update to 0.9.4, parallel build patch applied upstream.
+- Patch to fix library paths and LDFLAGS.
+- Don't require mozilla, but the plugin dir in signer.
+- Build with dependency tracking disabled.
+
+* Tue Jul 27 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.9.2-0.fdr.2
+- Building the signer plugin can be disabled with "--without signer".
+  Thanks to Fritz Elfert for the idea.
+- Update description.
+
+* Sun Jul 25 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.9.2-0.fdr.1
+- Update to 0.9.2, old patches applied upstream.
+- Add patch to fix parallel builds.
+- Convert man pages to UTF-8.
+
+* Thu Jul 22 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.9.1-0.fdr.1
+- Update to 0.9.1 (preview).
+
+* Thu Jul  1 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.9.0-0.fdr.0.1.alpha
+- Update to 0.9.0-alpha.
+
+* Sat May  1 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.8.1-0.fdr.8
+- Rebuild with libassuan 0.6.5.
+
+* Sat Jan 31 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.8.1-0.fdr.7
+- Rebuild with libassuan 0.6.3.
+- Add gdm example to PAM quickstart.
+
+* Mon Jan 19 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.8.1-0.fdr.6
+- Use /%%{_lib} instead of hardcoding /lib.
+
+* Sat Dec 20 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.8.1-0.fdr.5
+- Split PAM support into a subpackage.
+- Rebuild with libassuan 0.6.2.
+
+* Sun Nov 23 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.8.1-0.fdr.4
+- Rebuild with libassuan 0.6.1.
+- Include PAM quickstart doc snippet.
+
+* Fri Nov 14 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.8.1-0.fdr.3
+- Require OpenCT.
+
+* Fri Oct 17 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.8.1-0.fdr.2
+- Install example config files as documentation.
+
+* Tue Oct 14 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.8.1-0.fdr.1
+- Update to 0.8.1.
+
+* Wed Aug 27 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.8.0-0.fdr.2
+- Signer can be built with oldssl too.
+
+* Wed Aug 27 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.8.0-0.fdr.1
+- Update to 0.8.0.
+
+* Wed Jul 30 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.8.0-0.fdr.0.2.cvs20030730
+- Update to 20030730.
+- Clean up %%docs.
+- Include *.la (uses ltdl).
+- Own the %%{_libdir}/pkcs11 directory.
+- Disable signer; assuan has disappeared from the tarball :(
+
+* Fri May 23 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.8.0-0.fdr.0.1.rc1
+- First build.
diff --git a/sources b/sources
index e69de29..082f91e 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+76c18fc9bd9fad9c45396ea81f317551  opensc-0.9.4.tar.gz