diff --git a/tiff-am.patch b/tiff-am.patch
new file mode 100644
index 0000000..3cff9d3
--- /dev/null
+++ b/tiff-am.patch
@@ -0,0 +1,11 @@
+--- Makefile.am
++++ Makefile.am
+@@ -26,7 +26,7 @@
+ docdir = $(LIBTIFF_DOCDIR)
+ 
+ AUTOMAKE_OPTIONS = dist-zip foreign
+-ACLOCAL_AMFLAGS = -I ./m4
++ACLOCAL_AMFLAGS = -I m4
+ 
+ docfiles = \
+ 	COPYRIGHT \
diff --git a/tiff.changes b/tiff.changes
index 22e4e08..d5de711 100644
--- a/tiff.changes
+++ b/tiff.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Sep  7 11:24:56 CEST 2008 - schwab@suse.de
+
+- Fix conflicting options.
+
 -------------------------------------------------------------------
 Tue Aug 19 17:45:10 CEST 2008 - nadvornik@suse.cz
 
diff --git a/tiff.spec b/tiff.spec
index e04265e..a97f903 100644
--- a/tiff.spec
+++ b/tiff.spec
@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 
 Name:           tiff
@@ -25,7 +24,7 @@ Group:          Productivity/Graphics/Convertors
 AutoReqProv:    on
 Url:            http://www.remotesensing.org/libtiff/
 Version:        3.8.2
-Release:        128
+Release:        133
 Summary:        Tools for Converting from and to the Tiff  Format
 Source:         tiff-%{version}.tar.bz2
 Source1:        jpegint.h
@@ -35,6 +34,7 @@ Patch3:         tiff-%{version}-tiff2pdf.patch
 Patch4:         tiff-%{version}-tiffsplit-CVE-2006-2656.patch
 Patch5:         tiff-%{version}-tif_lzw.c-CVE-2008-2327.patch
 Patch6:         tiff-%{version}-tif_lzw.c-CVE-2008-2327-2.patch
+Patch7:         tiff-am.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -86,6 +86,7 @@ the libtiff library.
 %patch4
 %patch5
 %patch6
+%patch7
 cp %{S:1} libtiff
 find -type d -name "CVS" | xargs rm -rfv
 find -type d | xargs chmod 755
@@ -136,6 +137,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_mandir}/man3/*
 
 %changelog
+* Sun Sep 07 2008 schwab@suse.de
+- Fix conflicting options.
 * Tue Aug 19 2008 nadvornik@suse.cz
 - fixed buffer overflows in LZW code (CVE-2008-2327) [bnc#414946]
 * Sun May 18 2008 coolo@suse.de