--- tpm-tools-1.1.0/src/tpm_mgmt/Makefile.am.orig	2006-04-30 22:01:47.000000000 +0200
+++ tpm-tools-1.1.0/src/tpm_mgmt/Makefile.am	2006-04-30 22:02:05.000000000 +0200
@@ -37,8 +37,6 @@
 
 AM_CPPFLAGS	=	-I$(top_builddir)/include -D_LINUX
 
-AM_LDFLAGS	=	-ltspi
-
 LDADD		=	$(top_builddir)/lib/libtpm_tspi.la
 
 tpm_changeownerauth_SOURCES =	tpm_changeauth.c
--- tpm-tools-1.1.0/lib/Makefile.am.orig	2006-04-30 22:04:54.000000000 +0200
+++ tpm-tools-1.1.0/lib/Makefile.am	2006-04-30 22:04:59.000000000 +0200
@@ -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