diff -ru tpm-tools-1.2.3.orig/lib/Makefile.am tpm-tools-1.2.3/lib/Makefile.am
--- tpm-tools-1.2.3.orig/lib/Makefile.am	2005-08-09 06:10:04.000000000 +1000
+++ tpm-tools-1.2.3/lib/Makefile.am	2006-05-07 08:23:17.000000000 +1000
@@ -40,7 +40,7 @@
 #
 # TSPI interface library
 libtpm_tspi_la_SOURCES	=	tpm_tspi.c
-libtpm_tspi_la_LIBADD	=	libtpm_utils.la
+libtpm_tspi_la_LIBADD	=	libtpm_utils.la -ltspi
 
 #
 # PKCS#11 interface library
diff -ru tpm-tools-1.2.3.orig/src/tpm_mgmt/Makefile.am tpm-tools-1.2.3/src/tpm_mgmt/Makefile.am
--- tpm-tools-1.2.3.orig/src/tpm_mgmt/Makefile.am	2005-11-08 08:26:03.000000000 +1100
+++ tpm-tools-1.2.3/src/tpm_mgmt/Makefile.am	2006-05-07 08:22:56.000000000 +1000
@@ -39,8 +39,6 @@
 
 AM_CPPFLAGS	=	-I$(top_builddir)/include -D_LINUX
 
-AM_LDFLAGS	=	-ltspi
-
 LDADD		=	$(top_builddir)/lib/libtpm_tspi.la
 
 tpm_startup_SOURCES = 		tpm_startup.c