diff --git a/Makefile.am b/Makefile.am
index 605a66f4..1e476293 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,18 +1,8 @@
 ## Makefile.am -- Process this file with automake to produce Makefile.in
 
-AUX_DIST		= config.guess config.sub \
-			install-sh \
-			ltmain.sh \
-			missing \
-			mkinstalldirs \
-			depcomp
-EXTRA_DIST		= bootstrap
+SUBDIRS = . aclocal src
 
-SUBDIRS			= src
-MAINTAINERCLEANFILES	= Makefile.in aclocal.m4 configure config-h.in \
-			stamp-h.in $(AUX_DIST)
-dist-hook:
-	cd $(distdir)
-	for file in $(AUX_DIST); do \
-	  cp $$file $(distdir)/$$file; \
-	done
+EXTRA_DIST = bootstrap
+
+# require automake 1.5
+AUTOMAKE_OPTIONS = 1.5
diff --git a/bootstrap b/bootstrap
index 02f0767f..eaf5ff3c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,8 +1,11 @@
 #!/bin/sh
 
 set -x
+make distclean
+rm -f *.cache *.status *.log *.m4
+cat aclocal/*.m4 > acinclude.m4
 aclocal
-libtoolize --force --copy
-autoheader
-automake --add-missing --copy
-autoconf
+libtoolize --copy --force --automake
+autoheader configure.in > config.h.in
+automake --add-missing --copy --force
+autoreconf --gnu
diff --git a/configure.in b/configure.in
index a2327f72..9fd75257 100644
--- a/configure.in
+++ b/configure.in
@@ -1,55 +1,509 @@
-# Process this file with autoconf to produce a configure script.
-AC_INIT(libopensc)
-AC_CONFIG_SRCDIR(src/sc.c)
-AM_CONFIG_HEADER(config.h:config.h.in)
+dnl -*- mode: m4; -*-
+dnl Process this file with autoconf to produce a configure script.
+dnl $Id$
+
+# Require autoconf 2.52
+AC_PREREQ(2.52)
+
+AC_INIT(src/libopensc/sc.c)
 AM_INIT_AUTOMAKE(libopensc, 0.4.0)
+AM_CONFIG_HEADER(config.h)
 
-
-# Checks for programs.
+AC_CANONICAL_HOST
+case $host in
+  darwin* | rhapsody*)
+  AC_DEFINE(OS_MACOSX,1,[MacOS X])
+  ;;
+  beos*)
+  AC_DEFINE(OS_BEOS,1,[BeOS])
+  ;;
+  cygwin* | mingw* | pw32*)
+  AC_DEFINE(OS_CYGWIN,1,[Cywin32 and friends])
+  ;;
+  *irix*)
+  AC_DEFINE(OS_IRIX,1,[SGI IRIX])
+  ;;
+  *hpux*)
+  AC_DEFINE(OS_HPUX,1,[HP-UX])
+  ;;
+  *solaris* | *sunos*)
+  AC_DEFINE(OS_SOLARIS,1,[Sun Solaris])
+  ;;
+  *osf*)
+  AC_DEFINE(OS_DUNIX,1,[Digital UNIX])
+  ;;
+  *aix*)
+  AC_DEFINE(OS_AIX,1,[IBM AIX])
+  ;;
+  *freebsd*)
+  AC_DEFINE(OS_FREEBSD,1,[FreeBSD])
+  ;;
+  *netbsd*)
+  AC_DEFINE(OS_NETBSD,1,[NetBSD])
+  ;;
+  *openbsd*)
+  AC_DEFINE(OS_OPENBSD,1,[OpenBSD])
+  ;;
+  *linux*)
+  AC_DEFINE(OS_LINUX,1,[Linux])
+  ;;
+esac
 AC_PROG_CC
-AC_PROG_LIBTOOL
+AC_C_BIGENDIAN
 
-# Checks for libraries.
-AC_CHECK_LIB(pthread, pthread_mutex_lock, , AC_MSG_ERROR([*** libpthread not found]))
-AC_ARG_WITH(pcsclite,
-	[  --with-pcsclite=PATH    use PC/SC Lite in PATH],
+dnl Check for some target-specific stuff
+case "$host" in
+*-*-hpux*)
+	CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE"
+	AC_DEFINE(PAM_SUN_CODEBASE, 1, [PAM based on SUN codebase])
+	;;
+*-*-solaris*)
+	CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+	LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib"
+	need_dash_r=1
+	AC_DEFINE(PAM_SUN_CODEBASE, 1, [PAM based on SUN codebase])
+	;;
+*-*-sunos4*)
+	CPPFLAGS="$CPPFLAGS -DSUNOS4"
+	AC_CHECK_FUNCS(getpwanam)
+	AC_DEFINE(PAM_SUN_CODEBASE, 1, [PAM based on SUN codebase])
+	;;
+*-*-aix*)
+	CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+	LDFLAGS="$LDFLAGS -L/usr/local/lib"
+	if (test "$LD" != "gcc" && test -z "$blibpath"); then
+		blibpath="/usr/lib:/lib:/usr/local/lib"
+	fi
+	;;
+*-*-linux*)
+	;;
+esac
+
+dnl Allow user to specify flags
+AC_ARG_WITH(cflags,
+	[  --with-cflags           Specify additional flags to pass to compiler],
 	[
-		if test -d "$withval/lib"; then
-			if test -n "${need_dash_r}"; then
-				LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}"
-			else
-				LDFLAGS="-L${withval}/lib ${LDFLAGS}"
-			fi
-		else
-			if test -n "${need_dash_r}"; then
-				LDFLAGS="-L${withval} -R${withval} ${LDFLAGS}"
-			else
-				LDFLAGS="-L${withval} ${LDFLAGS}"
-			fi
-		fi
-		if test -d "$withval/include"; then
-			CPPFLAGS="-I${withval}/include ${CPPFLAGS}"
-		else
-			CPPFLAGS="-I${withval} ${CPPFLAGS}"
+		if test "x$withval" != "xno" ; then
+			CFLAGS="$CFLAGS $withval"
+		fi
+	]
+)
+AC_ARG_WITH(cppflags,
+	[  --with-cppflags         Specify additional flags to pass to preprocessor] ,
+	[
+		if test "x$withval" != "xno"; then
+			CPPFLAGS="$CPPFLAGS $withval"
+		fi
+	]
+)
+AC_ARG_WITH(ldflags,
+	[  --with-ldflags          Specify additional flags to pass to linker],
+	[
+		if test "x$withval" != "xno" ; then
+			LDFLAGS="$LDFLAGS $withval"
+		fi
+	]
+)
+AC_ARG_WITH(libs,
+	[  --with-libs             Specify additional libraries to link with],
+	[
+		if test "x$withval" != "xno" ; then
+			LIBS="$LIBS $withval"
 		fi
 	]
 )
-AC_CHECK_LIB(pcsclite, SCardEstablishContext, , AC_MSG_ERROR([*** PC/SC Lite missing - please install first]))
 
-# Checks for header files.
+dnl Checks for programs.
+AC_PROG_CPP
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+AM_PROG_LEX
+
+dnl Special check for pthread support.
+ACX_PTHREAD(
+[
+ AC_DEFINE(HAVE_PTHREAD,1,
+  [Define if you have POSIX threads libraries and header files.])
+], [
+ AC_MSG_ERROR([POSIX thread support required])
+])
+LIBS="$PTHREAD_LIBS $LIBS"
+CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+CC="$PTHREAD_CC"
+
+dnl Add libtool support.
+AM_PROG_LIBTOOL
+dnl Automatically update the libtool script if it becomes out-of-date.
+#AC_SUBST(LIBTOOL_DEPS)
+
+dnl Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS(stdlib.h string.h unistd.h assert.h strings.h)
+AC_CHECK_HEADERS([errno.h fcntl.h malloc.h stdlib.h string.h sys/time.h unistd.h syslog.h security/pam_appl.h security/_pam_macros.h])
 
-# Checks for typedefs, structures, and compiler characteristics.
+dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_TYPE_SIZE_T
+AC_HEADER_TIME
 
-# Checks for library functions.
+dnl Checks for library functions.
+AC_FUNC_ERROR_AT_LINE
 AC_FUNC_MALLOC
 AC_FUNC_MEMCMP
-AC_CHECK_FUNCS(memset strdup)
+AC_FUNC_STAT
+AC_FUNC_VPRINTF
+AC_CHECK_FUNCS([getpass gettimeofday memset mkdir strdup strerror])
 
-CFLAGS="${CFLAGS} -Wall"
+dnl C Compiler features
+AC_C_INLINE
+if test "$GCC" = "yes"; then
+	CFLAGS="$CFLAGS -Wall"
+fi
 
-AC_CONFIG_FILES(Makefile src/Makefile)
-AC_OUTPUT
+dnl OS specific options
+case "$host_os" in
+  hpux*)
+    CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
+    ;;
+  osf*)
+    CFLAGS="$CFLAGS -D_POSIX_PII_SOCKET"
+    ;;
+  *)
+    ;;
+esac
+
+AC_ARG_WITH(common-dir,
+	[  --with-common-dir=PATH  Specify path for common installation libraries],
+	[
+		if test "x$withval" != "xno" ; then
+			trycommondir=$withval
+		fi
+	]
+)
+
+saved_LDFLAGS="$LDFLAGS"
+saved_CPPFLAGS="$CPPFLAGS"
+if test "x$prefix" != "xNONE" ; then
+	trycommondir="$trycommondir $prefix"
+fi
+AC_CACHE_CHECK([for common directory], ac_cv_commondir, [
+	for commondir in $trycommondir "" /usr/local /usr/pkg /opt ; do
+		# Skip directories if they don't exist
+		if test ! -z "$commondir" -a ! -d "$commondir" ; then
+			continue;
+		fi
+		CPPFLAGS="$saved_CPPFLAGS"
+		LDFLAGS="$saved_LDFLAGS"
+
+		if test ! -z "$commondir" -a "x$commondir" != "x/usr"; then
+			# Try to use $commondir/lib if it exists, otherwise
+			# $commondir
+			if test -d "$commondir/lib" ; then
+				LDFLAGS="-L$commondir/lib $saved_LDFLAGS"
+				if test ! -z "$need_dash_r" ; then
+					LDFLAGS="-R$commondir/lib $LDFLAGS"
+				fi
+			else
+				LDFLAGS="-L$commondir $saved_LDFLAGS"
+				if test ! -z "$need_dash_r" ; then
+					LDFLAGS="-R$commondir $LDFLAGS"
+				fi
+			fi
+			# Try to use $commondir/include if it exists, otherwise
+			# $commondir
+			if test -d "$commondir/include" ; then
+				CPPFLAGS="-I$commondir/include $saved_CPPFLAGS"
+			else
+				CPPFLAGS="-I$commondir $saved_CPPFLAGS"
+			fi
+		fi
+		break;
+	done
+
+	if test -z "$commondir" ; then
+		commondir="(system)"
+	fi
+
+	ac_cv_commondir=$commondir
+])
+
+if (test ! -z "$ac_cv_commondir" && test "x$ac_cv_commondir" != "x(system)") ; then
+	dnl Need to recover commondir - test above runs in subshell
+	commondir=$ac_cv_commondir
+	if test ! -z "$commondir" -a "x$commondir" != "x/usr"; then
+		# Try to use $commondir/lib if it exists, otherwise
+		# $commondir
+		if test -d "$commondir/lib" ; then
+			LDFLAGS="-L$commondir/lib $saved_LDFLAGS"
+			if test ! -z "$need_dash_r" ; then
+				LDFLAGS="-R$commondir/lib $LDFLAGS"
+			fi
+		else
+			LDFLAGS="-L$commondir $saved_LDFLAGS"
+			if test ! -z "$need_dash_r" ; then
+				LDFLAGS="-R$commondir $LDFLAGS"
+			fi
+		fi
+		# Try to use $commondir/include if it exists, otherwise
+		# $commondir
+		if test -d "$commondir/include" ; then
+			CPPFLAGS="-I$commondir/include $saved_CPPFLAGS"
+		else
+			CPPFLAGS="-I$commondir $saved_CPPFLAGS"
+		fi
+	fi
+fi
+
+AC_SUBST(LIBPCSCLITE)
+saved_LIBS="$LIBS"
+saved_LDFLAGS="$LDFLAGS"
+saved_CPPFLAGS="$CPPFLAGS"
+AC_ARG_WITH(pcsclite,
+	[  --with-pcsclite=PATH    use PC/SC Lite in PATH],
+	[
+	for pcscdir in /pcsc ""; do
+		CPPFLAGS="$saved_CPPFLAGS"
+		LDFLAGS="$saved_LDFLAGS"
+		LIBS="$saved_LIBS $LIBCRYPTO"
+
+		if test -d "$withval/lib$pcscdir"; then
+			if test -n "${need_dash_r}"; then
+				LDFLAGS="-L${withval}/lib${pcscdir}/ -R${withval}/lib${pcscdir}/ ${LDFLAGS}"
+			else
+				LDFLAGS="-L${withval}/lib${pcscdir} ${LDFLAGS}"
+			fi
+		else
+			if test -n "${need_dash_r}"; then
+				LDFLAGS="-L${withval}${pcscdir} -R${withval}${pcscdir} ${LDFLAGS}"
+			else
+				LDFLAGS="-L${withval}${pcscdir} ${LDFLAGS}"
+			fi
+		fi
+		if test -d "$withval/include"; then
+			CPPFLAGS="-I${withval}/include${pcscdir} ${CPPFLAGS}"
+		else
+			CPPFLAGS="-I${withval}${pcscdir} ${CPPFLAGS}"
+		fi
+		AC_CHECK_LIB(pcsclite, SCardEstablishContext, [LIBPCSCLITE="$LIBPCSCLITE -lpcsclite"])
+		if test "x$ac_cv_lib_pcsclite_SCardEstablishContext" = "xyes" ; then
+			break;
+		fi
+	done
+	]
+)
+if test "x$ac_cv_lib_pcsclite_SCardEstablishContext" = "xno" ; then
+	AC_CHECK_LIB(pcsclite, SCardEstablishContext, [LIBPCSCLITE="$LIBPCSCLITE -lpcsclite"])
+fi
+AM_CONDITIONAL(HAVE_PCSCLITE, test "x$ac_cv_lib_pcsclite_SCardEstablishContext" = "xyes")
+
+AC_SUBST(LIBDL)
+AC_CHECK_LIB(dl, dlopen, [LIBDL="$LIBDL -ldl" ac_cv_func_dlopen_ldl=yes], ac_cv_func_dlopen_ldl=no)
+
+dnl The big search for OpenSSL
+AC_ARG_WITH(ssl-dir,
+	[  --with-ssl-dir=PATH     Specify path to OpenSSL installation],
+	[
+		if test "x$withval" != "xno" ; then
+			tryssldir=$withval
+		fi
+	]
+)
+
+saved_LIBS="$LIBS"
+saved_LDFLAGS="$LDFLAGS"
+saved_CPPFLAGS="$CPPFLAGS"
+if test "x$prefix" != "xNONE" ; then
+	tryssldir="$tryssldir $prefix"
+fi
+AC_SUBST(LIBCRYPTO)
+AC_CACHE_CHECK([for OpenSSL directory], ac_cv_openssldir, [
+	for ssldir in $tryssldir "" /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl ; do
+		# Skip directories if they don't exist
+		if test ! -z "$ssldir" -a ! -d "$ssldir" ; then
+			continue;
+		fi
+		LIBCRYPTO="-lcrypto"
+		CPPFLAGS="$saved_CPPFLAGS"
+		LDFLAGS="$saved_LDFLAGS"
+		LIBS="$saved_LIBS $LIBCRYPTO"
+
+		if test ! -z "$ssldir" -a "x$ssldir" != "x/usr"; then
+			# Try to use $ssldir/lib if it exists, otherwise
+			# $ssldir
+			if test -d "$ssldir/lib" ; then
+				LDFLAGS="-L$ssldir/lib $saved_LDFLAGS"
+				if test ! -z "$need_dash_r" ; then
+					LDFLAGS="-R$ssldir/lib $LDFLAGS"
+				fi
+			else
+				LDFLAGS="-L$ssldir $saved_LDFLAGS"
+				if test ! -z "$need_dash_r" ; then
+					LDFLAGS="-R$ssldir $LDFLAGS"
+				fi
+			fi
+			# Try to use $ssldir/include if it exists, otherwise
+			# $ssldir
+			if test -d "$ssldir/include" ; then
+				CPPFLAGS="-I$ssldir/include $saved_CPPFLAGS"
+			else
+				CPPFLAGS="-I$ssldir $saved_CPPFLAGS"
+			fi
+		fi
+
+		# Basic test to check for compatible version and correct linking
+		# *does not* test for RSA - that comes later.
+		AC_TRY_RUN(
+			[
+#include <string.h>
+#include <openssl/rand.h>
+int main(void)
+{
+	char a[2048];
+	memset(a, 0, sizeof(a));
+	RAND_add(a, sizeof(a), sizeof(a));
+	return(RAND_status() <= 0);
+}
+			],
+			[
+				found_crypto=1
+				break;
+			], []
+		)
+
+		if test ! -z "$found_crypto" ; then
+			break;
+		fi
+	done
+
+	if test -z "$ssldir" ; then
+		ssldir="(system)"
+	fi
+	if test -n "$found_crypto" ; then
+		AM_CONDITIONAL(HAVE_SSL, test -n "$found_crypto")
+		ac_cv_openssldir=$ssldir
+	fi
+])
+
+if (test ! -z "$ac_cv_openssldir" && test "x$ac_cv_openssldir" != "x(system)") ; then
+	AC_DEFINE(HAVE_OPENSSL, 1, [Have OpenSSL libraries])
+	dnl Need to recover ssldir - test above runs in subshell
+	ssldir=$ac_cv_openssldir
+	if test ! -z "$ssldir" -a "x$ssldir" != "x/usr"; then
+		# Try to use $ssldir/lib if it exists, otherwise
+		# $ssldir
+		if test -d "$ssldir/lib" ; then
+			LDFLAGS="-L$ssldir/lib $saved_LDFLAGS"
+			if test ! -z "$need_dash_r" ; then
+				LDFLAGS="-R$ssldir/lib $LDFLAGS"
+			fi
+		else
+			LDFLAGS="-L$ssldir $saved_LDFLAGS"
+			if test ! -z "$need_dash_r" ; then
+				LDFLAGS="-R$ssldir $LDFLAGS"
+			fi
+		fi
+		# Try to use $ssldir/include if it exists, otherwise
+		# $ssldir
+		if test -d "$ssldir/include" ; then
+			CPPFLAGS="-I$ssldir/include $saved_CPPFLAGS"
+		else
+			CPPFLAGS="-I$ssldir $saved_CPPFLAGS"
+		fi
+	fi
+fi
+LIBS="$saved_LIBS"
+
+dnl Check for PAM libs
+PAM_MSG="no"
+no_pam=""
+AC_SUBST(LIBPAM)
+saved_LIBS="$LIBS"
+AC_MSG_CHECKING([PAM support])
+AC_ARG_WITH(pam,
+	[  --with-pam              Enable PAM support],
+	[
+		if test "x$withval" = "xno" ; then
+			AC_MSG_RESULT(disabled)
+			no_pam=1
+		fi
+	],
+)
+if test -z "$no_pam" ; then
+	if test "x$ac_cv_header_security_pam_appl_h" = "xyes" ; then
+		AC_MSG_RESULT(yes)
+		PAM_MSG="yes"
+		AC_CHECK_LIB(pam, pam_set_item, [LIBPAM="$LIBPAM -lpam"], AC_MSG_ERROR([*** libpam missing]))
+		LIBS="$LIBS $LIBPAM"
+		AC_CHECK_FUNCS(pam_getenvlist)
+		AC_CHECK_FUNCS(pam_putenv)
+		disable_shadow=yes
+		AC_DEFINE(HAVE_PAM, 1, [Have Pluggable Authentication Modules])
+	else
+		AC_MSG_RESULT(no)
+	fi
+fi
+
+dnl Check for older PAM
+if test "x$PAM_MSG" = "xyes" ; then
+	# Check PAM strerror arguments (old PAM)
+	AC_MSG_CHECKING([whether pam_strerror takes only one argument])
+	AC_TRY_COMPILE(
+		[
+#include <stdlib.h>
+#include <security/pam_appl.h>
+		],
+		[(void)pam_strerror((pam_handle_t *)NULL, -1);],
+		[AC_MSG_RESULT(no)],
+		[
+			AC_DEFINE(HAVE_OLD_PAM, 1, [Have OLD Pluggable Authentication Modules])
+			AC_MSG_RESULT(yes)
+			PAM_MSG="yes (old library)"
+		]
+	)
+fi
+LIBS="$saved_LIBS"
+AM_CONDITIONAL(COMPILE_PAM, test "x$PAM_MSG" = "xyes")
+
+dnl Enable/disable debugging messages.
+AC_ARG_ENABLE(debug,
+[  --enable-debug          enable debug messages. [default=no]],
+	, enable_debug=no)
+if (test x$enable_debug = xyes); then
+	AC_DEFINE(DEBUG, 1, [Enable debug messages.])
+fi
+
+AC_OUTPUT([
+Makefile
+aclocal/Makefile
+src/Makefile
+src/libopensc/Makefile
+src/openssh/Makefile
+src/pam/Makefile
+src/pkcs11/Makefile
+src/pkcs11/pkcs11/Makefile
+src/tests/Makefile
+src/tools/Makefile
+])
+
+dnl Someone please show me a better way :)
+A=`eval echo ${prefix}` ; A=`eval echo ${A}`
+B=`eval echo ${bindir}` ; B=`eval echo ${B}`
+
+echo ""
+echo "OpenSC has been configured with the following options"
+
+echo ""
+echo "User binaries:       ${B}"
+
+echo ""
+echo "Host:                ${host}"
+echo "Compiler:            ${CC}"
+echo "Compiler flags:      ${CFLAGS}"
+echo "Preprocessor flags:  ${CPPFLAGS}"
+echo "Linker flags:        ${LDFLAGS}"
+echo "Libraries:           ${LIBS}"
+
+echo ""
+echo "PAM support:         ${PAM_MSG}"
+
+echo ""
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 00000000..00af34c0
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,3 @@
+# Process this file with automake to create Makefile.in
+
+SUBDIRS = libopensc tests tools openssh pam pkcs11
diff --git a/src/libopensc/Makefile.am b/src/libopensc/Makefile.am
index 00c400f0..f2f62644 100644
--- a/src/libopensc/Makefile.am
+++ b/src/libopensc/Makefile.am
@@ -1,7 +1,5 @@
 ## Makefile.am -- Process this file with automake to produce Makefile.in
 
-LD = ccmalloc gcc
-
 lib_LTLIBRARIES		= libopensc.la
 libopensc_la_SOURCES	= sc-asn1.c sc-base64.c sc-defaults.c \
 			  sc-sec.c sc-log.c sc.c sc-card.c sc-iso7816.c\
@@ -10,6 +8,7 @@ libopensc_la_SOURCES	= sc-asn1.c sc-base64.c sc-defaults.c \
 			  sc-pkcs15-defaults.c sc-pkcs15-sec.c \
 			  sc-card-setec.c
 libopensc_la_LDFLAGS	= -version-info 0:4:0
-libopensc_la_CFLAGS	= $(AM_CFLAGS) -Werror
+libopensc_la_LIBADD	= @LIBPCSCLITE@
+
 include_HEADERS		= opensc.h opensc-pkcs15.h
 noinst_HEADERS		= sc-asn1.h sc-log.h
diff --git a/src/openssh/Makefile.am b/src/openssh/Makefile.am
new file mode 100644
index 00000000..175adc1a
--- /dev/null
+++ b/src/openssh/Makefile.am
@@ -0,0 +1,9 @@
+# Process this file with automake to create Makefile.in
+
+INCLUDES = -I$(top_srcdir)/src/libopensc
+LDFLAGS = @LDFLAGS@ @LIBCRYPTO@ \
+	$(top_srcdir)/src/libopensc/libopensc.la
+
+bin_PROGRAMS = opensc-ssh
+
+opensc_ssh_SOURCES = opensc-ssh.c
diff --git a/src/pam/Makefile.am b/src/pam/Makefile.am
new file mode 100644
index 00000000..cd6f81ab
--- /dev/null
+++ b/src/pam/Makefile.am
@@ -0,0 +1,33 @@
+# Process this file with automake to create Makefile.in
+
+libdir = ${prefix}/lib/security
+
+INCLUDES = -I$(top_srcdir)/src/libopensc
+LDFLAGS = @LDFLAGS@ @LIBDL@ @LIBPAM@ @LIBCRYPTO@ \
+	$(top_srcdir)/src/libopensc/libopensc.la
+
+SRC = pam_pkcs15.c
+INC = 
+
+if COMPILE_PAM
+lib_LTLIBRARIES = libpam_pkcs15.la
+noinst_PROGRAMS = pam_pkcs15-test
+else
+lib_LTLIBRARIES = 
+noinst_PROGRAMS = 
+endif
+
+libpam_pkcs15_la_SOURCES = $(SRC) $(INC)
+libpam_pkcs15_la_LDFLAGS = -module
+
+pam_pkcs15_test_SOURCES = $(SRC) $(INC)
+pam_pkcs15_test_CFLAGS = -DTEST
+
+if COMPILE_PAM
+
+install-exec-local: install-libLTLIBRARIES
+	@$(NORMAL_INSTALL)
+	-rm -f $(DESTDIR)$(libdir)/pam_pkcs15.so
+	-cd $(DESTDIR)$(libdir) && ln -s libpam_pkcs15.so pam_pkcs15.so
+
+endif
diff --git a/src/pkcs11/Makefile.am b/src/pkcs11/Makefile.am
new file mode 100644
index 00000000..6d76f263
--- /dev/null
+++ b/src/pkcs11/Makefile.am
@@ -0,0 +1,19 @@
+# Process this file with automake to create Makefile.in
+
+SUBDIRS = . pkcs11
+
+libdir = ${prefix}/lib/pkcs11
+
+INCLUDES = -I$(top_srcdir)/src/libopensc
+
+LDFLAGS = @LDFLAGS@ @LIBDL@ \
+	$(top_srcdir)/src/libopensc/libopensc.la
+
+SRC = function_table.c generic.c session.c object.c \
+	endecrypt.c digestsign.c verify.c misc.c slot.c
+INC = sc-pkcs11.h
+
+lib_LTLIBRARIES = libopensc-pkcs11.la
+
+libopensc_pkcs11_la_SOURCES = $(SRC) $(INC)
+libopensc_pkcs11_la_LDFLAGS = -module
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
new file mode 100644
index 00000000..22abe72d
--- /dev/null
+++ b/src/tests/Makefile.am
@@ -0,0 +1,17 @@
+# Process this file with automake to create Makefile.in
+
+INCLUDES = -I$(top_srcdir)/src/libopensc
+LDFLAGS = @LDFLAGS@ \
+	$(top_srcdir)/src/libopensc/libopensc.la
+
+noinst_PROGRAMS = base64 hst-test lottery p15dump \
+		  pintest prngtest
+
+COMMON_SRC = sc-test.c
+
+base64_SOURCES = base64.c $(COMMON_SRC)
+hst_test_SOURCES = hst-test.c $(COMMON_SRC)
+lottery_SOURCES = lottery.c $(COMMON_SRC)
+p15dump_SOURCES = p15dump.c $(COMMON_SRC)
+pintest_SOURCES = pintest.c $(COMMON_SRC)
+prngtest_SOURCES = prngtest.c $(COMMON_SRC)
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
new file mode 100644
index 00000000..f9117d85
--- /dev/null
+++ b/src/tools/Makefile.am
@@ -0,0 +1,10 @@
+# Process this file with automake to create Makefile.in
+
+INCLUDES = -I$(top_srcdir)/src/libopensc
+LDFLAGS = @LDFLAGS@ \
+	$(top_srcdir)/src/libopensc/libopensc.la
+
+bin_PROGRAMS = opensc-crypt opensc-tool
+
+opensc_crypt_SOURCES = opensc-crypt.c
+opensc_tool_SOURCES = opensc-tool.c