diff --git a/tpm-tools-1.3.7-build.patch b/tpm-tools-1.3.7-build.patch
deleted file mode 100644
index 070b69f..0000000
--- a/tpm-tools-1.3.7-build.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -urp tpm-tools-1.3.8.orig/lib/Makefile.am tpm-tools-1.3.8/lib/Makefile.am
---- tpm-tools-1.3.8.orig/lib/Makefile.am	2012-05-17 13:50:39.000000000 -0400
-+++ tpm-tools-1.3.8/lib/Makefile.am	2012-06-21 13:07:29.624445940 -0400
-@@ -52,7 +52,7 @@ if P11_SUPPORT
- noinst_LTLIBRARIES	+=	libtpm_pkcs11.la
- 
- libtpm_pkcs11_la_SOURCES=	tpm_pkcs11.c
--libtpm_pkcs11_la_LIBADD	=	libtpm_utils.la
-+libtpm_pkcs11_la_LIBADD	=	libtpm_utils.la -ldl
- endif
- 
- #
-diff -urp tpm-tools-1.3.8.orig/lib/tpm_tspi.c tpm-tools-1.3.8/lib/tpm_tspi.c
---- tpm-tools-1.3.8.orig/lib/tpm_tspi.c	2011-08-17 08:20:35.000000000 -0400
-+++ tpm-tools-1.3.8/lib/tpm_tspi.c	2012-06-21 13:07:29.654445942 -0400
-@@ -702,14 +702,14 @@ TSS_RESULT
- unloadNVDataPublic(UINT64 *offset, BYTE *blob, UINT32 blob_len, TPM_NV_DATA_PUBLIC *v)
- {
- 	UINT64 off = *offset;
--	TSS_RESULT result;
--	result = Trspi_UnloadBlob_NV_DATA_PUBLIC(&off, blob, NULL);
-+	TSS_RESULT result = TSS_SUCCESS;
-+/*	result = Trspi_UnloadBlob_NV_DATA_PUBLIC(&off, blob, NULL);
- 	if (result == TSS_SUCCESS) {
- 		if (off > blob_len)
- 			return TSS_E_BAD_PARAMETER;
- 		result = Trspi_UnloadBlob_NV_DATA_PUBLIC(offset, blob, v);
- 	}
--	tspiResult("Trspi_UnloadBlob_NV_DATA_PUBLIC", result);
-+	tspiResult("Trspi_UnloadBlob_NV_DATA_PUBLIC", result); */
- 	return result;
- }
- 
-diff -urp tpm-tools-1.3.8.orig/src/tpm_mgmt/Makefile.am tpm-tools-1.3.8/src/tpm_mgmt/Makefile.am
---- tpm-tools-1.3.8.orig/src/tpm_mgmt/Makefile.am	2012-05-17 13:50:39.000000000 -0400
-+++ tpm-tools-1.3.8/src/tpm_mgmt/Makefile.am	2012-06-21 13:07:29.655445942 -0400
-@@ -23,6 +23,8 @@
- 
- noinst_HEADERS	=	tpm_nvcommon.h
- 
-+noinst_HEADERS  =       tpm_nvcommon.h
-+
- noinst_PROGRAMS =	tpm_startup	\
- 			tpm_reset
- 
-Only in tpm-tools-1.3.8/src/tpm_mgmt: Makefile.am.orig
diff --git a/tpm-tools.spec b/tpm-tools.spec
index fc01276..3695094 100644
--- a/tpm-tools.spec
+++ b/tpm-tools.spec
@@ -1,7 +1,7 @@
 Name:             tpm-tools
 Summary:          Management tools for the TPM hardware
 Version:          1.3.8
-Release:          5%{?dist}
+Release:          6%{?dist}
 License:          CPL
 Group:            Applications/System
 URL:              http://trousers.sourceforge.net
@@ -9,12 +9,10 @@ URL:              http://trousers.sourceforge.net
 Source0:          http://downloads.sourceforge.net/trousers/%{name}-%{version}.tar.gz
 # Package unnecessarily has -Werror and any problem kills the build
 Patch0:	          tpm-tools-1.3.5-no-werror.patch
-# Package has other flaws preventing proper build
-Patch1:           tpm-tools-1.3.7-build.patch
 
 BuildRequires:    trousers-devel openssl-devel opencryptoki-devel chrpath
 # Working with upstream to fix this, but in the mean time we need this
-BuildRequires:    automake autoconf
+BuildRequires:    automake autoconf gettext-devel libtool
 
 %description
 tpm-tools is a group of tools to manage and utilize the Trusted Computing
@@ -46,8 +44,7 @@ for developing tpm-tools applications.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-autoreconf
+autoreconf -i
 
 %build
 %configure
@@ -87,6 +84,10 @@ chrpath -d %{buildroot}%{_bindir}/tpm_sealdata
 %{_mandir}/man3/tpmUnseal*
 
 %changelog
+* Thu Apr 03 2014 Michal Schmidt <mschmidt@redhat.com> - 1.3.8-6
+- Fix FTBFS with current autotools (#1083627)
+- Drop tpm-tools-1.3.7-build.patch, the package builds without it (#952372)
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.8-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild