diff --git a/tk-gifcrash.patch b/tk-gifcrash.patch
new file mode 100644
index 0000000..335000e
--- /dev/null
+++ b/tk-gifcrash.patch
@@ -0,0 +1,11 @@
+--- generic/tkImgGIF.c
++++ generic/tkImgGIF.c
+@@ -995,7 +995,7 @@
+ 	 */
+ 	if (interlace) {
+ 	    ypos += interlaceStep[pass];
+-	    while (ypos >= height) {
++	    while (ypos >= rows) {
+ 		pass++;
+ 		if (pass > 3) {
+ 		    return TCL_OK;
diff --git a/tk.changes b/tk.changes
index fcf8438..ef6bb91 100644
--- a/tk.changes
+++ b/tk.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 11 20:35:28 CEST 2007 - max@suse.de
+
+- Fix a crash with multi-frame interlaced GIFs (#309607).
+
 -------------------------------------------------------------------
 Wed Jun  6 18:24:19 CEST 2007 - max@suse.de
 
diff --git a/tk.spec b/tk.spec
index 517e686..7bb299d 100644
--- a/tk.spec
+++ b/tk.spec
@@ -14,10 +14,10 @@ Name:           tk
 BuildRequires:  tcl-devel xorg-x11-libX11-devel xorg-x11-libXt-devel
 URL:            http://www.tcl.tk
 Version:        8.4.15
-Release:        1
+Release:        21
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        Graphical User Interface Toolkit for Tcl
-License:        BSD License and BSD-like
+License:        BSD 3-Clause
 Group:          Development/Languages/Tcl
 Autoreqprov:    on
 Summary:        Graphical User Interface Toolkit for Tcl
@@ -26,6 +26,7 @@ Requires:       tcl >= %version tcl < 8.5
 Prereq:         /bin/rm
 Source0:        %name%{version}-src.tar.bz2
 Patch0:         %name.patch
+Patch1:         tk-gifcrash.patch
 
 %description
 Tk is a graphical user interface toolkit that takes developing desktop
@@ -42,7 +43,7 @@ Authors:
 
 %package devel
 Group:          Development/Libraries/Tcl
-License:        BSD License and BSD-like
+License:        BSD 3-Clause
 Summary:        Header Files and C API Documentation for Tk
 Requires:       tk = %version, tcl-devel
 
@@ -64,6 +65,7 @@ Authors:
 %prep
 %setup -q -n %name%version
 %patch0
+%patch1
 pushd unix
   autoconf
 popd
@@ -122,6 +124,8 @@ exit 0
 %_libdir/tkConfig.sh
 
 %changelog
+* Tue Sep 11 2007 - max@suse.de
+- Fix a crash with multi-frame interlaced GIFs (#309607).
 * Wed Jun 06 2007 - max@suse.de
 - New patchlevel release: 8.4.15
 - improve performance of [$listbox itemconfigure]