diff --git a/gawk.changes b/gawk.changes
index 3c181bd..932d8a1 100644
--- a/gawk.changes
+++ b/gawk.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Feb  7 18:10:26 CET 2009 - schwab@suse.de
+
+- Rebuild broken info files.
+
 -------------------------------------------------------------------
 Mon Nov 12 14:50:34 CET 2007 - schwab@suse.de
 
diff --git a/gawk.spec b/gawk.spec
index 8e70a9c..c5f2a95 100644
--- a/gawk.spec
+++ b/gawk.spec
@@ -1,14 +1,20 @@
 #
 # spec file for package gawk (Version 3.1.6)
 #
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 
 Name:           gawk
@@ -19,7 +25,7 @@ Provides:       awk
 AutoReqProv:    on
 PreReq:         %{install_info_prereq}
 Version:        3.1.6
-Release:        1
+Release:        25
 Summary:        GNU awk
 Source:         gawk-%{version}.tar.bz2
 Patch:          gawk-%{version}.diff
@@ -45,21 +51,25 @@ Authors:
 %setup -q
 %patch
 rm -f regex.[ch]
+chmod -x COPYING
+# force rebuild with non-broken makeinfo
+rm -f doc/*.info
 
 %build
-%{suse_update_config -f}
 AUTOPOINT=true autoreconf --force --install
-export CFLAGS=$RPM_OPT_FLAGS
-./configure --prefix=/usr --libexecdir=%{_libdir} \
+./configure CFLAGS="$RPM_OPT_FLAGS" \
+	    --prefix=/usr --libexecdir=%{_libdir} \
 	    --mandir=%{_mandir} --infodir=%{_infodir}
 %if %do_profiling
-  make %{?jobs:-j%jobs} CFLAGS="$CFLAGS %cflags_profile_generate"
+  make %{?jobs:-j%jobs} CFLAGS="$RPM_OPT_FLAGS %cflags_profile_generate"
   make check
   make clean
-  make %{?jobs:-j%jobs} CFLAGS="$CFLAGS %cflags_profile_feedback"
+  make %{?jobs:-j%jobs} CFLAGS="$RPM_OPT_FLAGS %cflags_profile_feedback"
 %else
   make %{?jobs:-j%jobs}
 %endif
+
+%check
 make check
 
 %install
@@ -94,6 +104,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*.1.gz
 
 %changelog
+* Sat Feb 07 2009 schwab@suse.de
+- Rebuild broken info files.
 * Mon Nov 12 2007 schwab@suse.de
 - Update to gawk 3.1.6.
   1. `gawk 'program' /non/existant/file' no longer core dumps.
@@ -159,7 +171,7 @@ rm -rf $RPM_BUILD_ROOT
 - New version of last change.
 * Sun Jun 18 2006 schwab@suse.de
 - Properly handle /dev/fd.
-* Sun Mar 05 2006 schwab@suse.de
+* Sat Mar 04 2006 schwab@suse.de
 - Add two wide string bug fixes.
 * Thu Feb 09 2006 schwab@suse.de
 - Fix dfa generation of interval expressions [#148453].
@@ -167,7 +179,7 @@ rm -rf $RPM_BUILD_ROOT
 - Use %%jobs.
 * Wed Jan 25 2006 mls@suse.de
 - converted neededforbuild to BuildRequires
-* Thu Dec 01 2005 schwab@suse.de
+* Wed Nov 30 2005 schwab@suse.de
 - Fix length on strings with embedded NUL.
 * Fri Oct 07 2005 schwab@suse.de
 - Fix off-by-one when processing FIELDWIDTHS.
@@ -179,10 +191,10 @@ rm -rf $RPM_BUILD_ROOT
 - Add libpng to neededforbuild.
 * Wed Feb 02 2005 schwab@suse.de
 - Ignore exit code from pipes.
-* Wed Sep 29 2004 schwab@suse.de
+* Tue Sep 28 2004 schwab@suse.de
 - Fix parsing of floating point number that start with more than one
   zero.
-* Mon Sep 20 2004 schwab@suse.de
+* Sun Sep 19 2004 schwab@suse.de
 - Disable invalid shortcut in dfaexec [#44512].
 - Fix reading past EOF.
 * Mon Aug 23 2004 schwab@suse.de
@@ -233,7 +245,7 @@ rm -rf $RPM_BUILD_ROOT
 - Update to gawk-3.1.1 (bugfix release).
 * Tue Apr 09 2002 schwab@suse.de
 - Fix default AWKPATH.
-* Sun Mar 31 2002 schwab@suse.de
+* Sat Mar 30 2002 schwab@suse.de
 - Fix for new gettext.
 * Sun Mar 17 2002 schwab@suse.de
 - Fix buffer overflow.
@@ -253,7 +265,7 @@ rm -rf $RPM_BUILD_ROOT
 - Use regex from libc again.
 * Wed Nov 07 2001 schwab@suse.de
 - Fix memory overrun.
-* Tue Nov 06 2001 schwab@suse.de
+* Mon Nov 05 2001 schwab@suse.de
 - Fix lint checking and off-by-one error for printf.
 * Fri Oct 05 2001 schwab@suse.de
 - Fix for memory corruption bug from author.
@@ -337,7 +349,7 @@ rm -rf $RPM_BUILD_ROOT
 - gawk should work with c-news again
 * Tue May 20 1997 florian@suse.de
 - update to version 3.0.3
-* Mon Apr 14 1997 florian@suse.de
+* Sun Apr 13 1997 florian@suse.de
 - add bug-fixes from gnu.utils.bugs
 - do not use /usr/libexec anymore
 * Wed Jan 22 1997 florian@suse.de