diff --git a/t1utils-getline.patch b/t1utils-getline.patch
new file mode 100644
index 0000000..b43f301
--- /dev/null
+++ b/t1utils-getline.patch
@@ -0,0 +1,29 @@
+--- t1asm.c
++++ t1asm.c
+@@ -275,7 +275,7 @@
+    the newline is put into line[]. When terminated by '{', the '{' is not put
+    into line[], and the flag start_charstring is set to 1. */
+ 
+-static void getline()
++static void my_getline()
+ {
+   int c;
+   char *p = line;
+@@ -716,7 +716,7 @@
+      without /Subrs sections and provided a patch. */
+   
+   while (!feof(ifp) && !ferror(ifp)) {
+-    getline();
++    my_getline();
+     
+     if (!ever_active) {
+       if (strncmp(line, "currentfile eexec", 17) == 0) {
+@@ -788,7 +788,7 @@
+   
+   /* There may be additional code. */
+   while (!feof(ifp) && !ferror(ifp)) {
+-    getline();
++    my_getline();
+     eexec_string(line);
+   }
+   
diff --git a/t1utils.changes b/t1utils.changes
index 13cb2c8..1f83e05 100644
--- a/t1utils.changes
+++ b/t1utils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jun  8 00:23:40 CEST 2009 - ro@suse.de
+
+- rename getline to my_getline to avoid collision with function
+  from glibc 
+
 -------------------------------------------------------------------
 Wed Jan 25 21:42:00 CET 2006 - mls@suse.de
 
diff --git a/t1utils.spec b/t1utils.spec
index a0d7471..f302432 100644
--- a/t1utils.spec
+++ b/t1utils.spec
@@ -1,24 +1,33 @@
 #
 # spec file for package t1utils (Version 1.26)
 #
-# Copyright (c) 2004 SuSE Linux AG, 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.
 #
-# Please submit bugfixes or comments via http://www.suse.de/feedback/
+# 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:         t1utils
-License:      Other License(s), see package
-Group:        Productivity/Publishing/PS
-Autoreqprov:  on
-Version:      1.26
-Release:      224
-Source0:      ftp://ftp.tex.ac.uk/tex-archive/fonts/utilities/t1utils/t1utils-%{version}.tar.bz2
-BuildRoot:    %{_tmppath}/%{name}-%{version}-build
-Summary:      a collection of simple type-1 font manipulation programs
+
+Name:           t1utils
+License:        Any permissive
+Group:          Productivity/Publishing/PS
+AutoReqProv:    on
+Version:        1.26
+Release:        390
+Source0:        ftp://ftp.tex.ac.uk/tex-archive/fonts/utilities/t1utils/t1utils-%{version}.tar.bz2
+Patch:          t1utils-getline.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Summary:        a collection of simple type-1 font manipulation programs
 
 %description
 t1utils is a collection of simple type-1 font manipulation programs.
@@ -36,7 +45,8 @@ Authors:
     Eddie Kohler <eddietwo@lcs.mit.edu>
 
 %prep
-%setup0
+%setup -q
+%patch
 
 %build
 rm -f config.cache
@@ -72,13 +82,16 @@ make DESTDIR=$RPM_BUILD_ROOT  install
 /usr/share/man/man1/t1ascii.1.gz
 /usr/share/man/man1/t1binary.1.gz
 
-%changelog -n t1utils
-* Wed Jan 25 2006 - mls@suse.de
+%changelog
+* Mon Jun 08 2009 ro@suse.de
+- rename getline to my_getline to avoid collision with function
+  from glibc
+* Wed Jan 25 2006 mls@suse.de
 - converted neededforbuild to BuildRequires
-* Thu Mar 25 2004 - kukuk@suse.de
+* Thu Mar 25 2004 kukuk@suse.de
 - Cleanup neededforbuild
 - Don't build as root
-* Sun Aug 11 2002 - mfabian@suse.de
+* Sun Aug 11 2002 mfabian@suse.de
 - update to 1.26
   * t1mac: Fix buglet (C++ comment, and temporary file left behind). Reported
   by Vladimir Volovich <vvv@vsu.ru>.
@@ -86,13 +99,13 @@ make DESTDIR=$RPM_BUILD_ROOT  install
   Luc Devroye <luc@cs.mcgill.ca>.
   * Fixed compilation bugs on various platforms reported by Nelson H. F.
   Beebe <beebe@math.utah.edu>.
-* Tue Nov 13 2001 - mfabian@suse.de
+* Tue Nov 13 2001 mfabian@suse.de
 - update to t1utils-1.23
-- Fixed Macintosh file bugs
-- Fixed bug on processing PFA fonts with DOS line endings.
-- t1ascii, t1asm, t1unmac: Raised minimum PFA line length to 8.
+  - Fixed Macintosh file bugs
+  - Fixed bug on processing PFA fonts with DOS line endings.
+  - t1ascii, t1asm, t1unmac: Raised minimum PFA line length to 8.
   (For details please read the NEWS file).
-* Mon May 07 2001 - mfabian@suse.de
+* Mon May 07 2001 mfabian@suse.de
 - bzip2 sources
-* Fri Dec 01 2000 - Mike Fabian <mfabian@suse.de>
+* Fri Dec 01 2000 Mike Fabian <mfabian@suse.de>
 - new package: t1utils-1.20