diff --git a/libpaper-1.1.20-automake_1.10.patch b/libpaper-1.1.20-automake_1.10.patch
new file mode 100644
index 0000000..55be567
--- /dev/null
+++ b/libpaper-1.1.20-automake_1.10.patch
@@ -0,0 +1,11 @@
+--- libpaper-1.1.20/aclocal.m4.orig	2006-01-07 16:10:33.000000000 -0500
++++ libpaper-1.1.20/aclocal.m4	2007-07-09 09:09:07.000000000 -0400
+@@ -6433,7 +6433,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api
+ # Call AM_AUTOMAKE_VERSION so it can be traced.
+ # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-	 [AM_AUTOMAKE_VERSION([1.9.6])])
++	 [AM_AUTOMAKE_VERSION([1.10])])
+ 
+ # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+ 
diff --git a/libpaper.spec b/libpaper.spec
index 4e0efb7..c669414 100644
--- a/libpaper.spec
+++ b/libpaper.spec
@@ -1,11 +1,12 @@
 Name:		libpaper
-Version:	1.1.20
-Release:	5%{?dist}
+Version:	1.1.21
+Release:	1%{?dist}
 Summary:	Library and tools for handling papersize
 Group:		System Environment/Libraries
 License:	GPL
 URL:		http://packages.qa.debian.org/libp/libpaper.html
 Source0:	http://ftp.debian.org/debian/pool/main/libp/libpaper/%{name}_%{version}.tar.gz
+Patch0:		libpaper-1.1.20-automake_1.10.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	automake, gettext
 
@@ -28,10 +29,13 @@ to develop applications which use libpaper.
 
 %prep
 %setup -q
+%patch0 -p1
 cp debian/NEWS NEWS
 
 %build
 touch AUTHORS
+aclocal
+autoconf
 automake -a
 %configure --disable-static
 make %{?_smp_mflags}
@@ -75,6 +79,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Mon Jul 09 2007 Tom "spot" Callaway <tcallawa@redhat.com> 1.1.21-1
+- bump to 1.1.21
+- fix automake bug (bz 247458)
+
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli@licr.org> 1.1.20-5
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
diff --git a/sources b/sources
index 29d374f..5ac5156 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7075f580606a84e63b7d6d9fa3124c31  libpaper_1.1.20.tar.gz
+6397f8d60a157119c1de5d19e4d82436  libpaper_1.1.21.tar.gz