diff --git a/texinfo-4.13a-bug640417.diff b/texinfo-4.13a-bug640417.diff
new file mode 100644
index 0000000..4c23acb
--- /dev/null
+++ b/texinfo-4.13a-bug640417.diff
@@ -0,0 +1,31 @@
+--- texinfo-4.13-/info/window.c	2008-09-18 20:31:59.000000000 +0200
++++ texinfo-4.13/info/window.c	2010-09-20 21:32:41.941755338 +0200
+@@ -1581,7 +1581,7 @@
+       const char *carried_over_ptr;
+       size_t carried_over_len, carried_over_count;
+       const char *cur_ptr = mbi_cur_ptr (iter);
+-      int cur_len = mb_len (mbi_cur (iter));
++      size_t cur_len = mb_len (mbi_cur (iter));
+       int replen;
+       int delim = 0;
+       int rc;
+@@ -1754,7 +1754,7 @@
+        mbi_advance (iter))
+     {
+       const char *cur_ptr = mbi_cur_ptr (iter);
+-      int cur_len = mb_len (mbi_cur (iter));
++      size_t cur_len = mb_len (mbi_cur (iter));
+ 
+       if (cur_len == 1)
+ 	{
+@@ -1852,8 +1852,8 @@
+        mbi_advance (iter))
+     {
+       const char *cur_ptr = mbi_cur_ptr (iter);
+-      int cur_len = mb_len (mbi_cur (iter));
+-      int replen;
++      size_t cur_len = mb_len (mbi_cur (iter));
++      size_t replen;
+ 
+       if (cur_ptr >= endp)
+ 	break;
diff --git a/texinfo.changes b/texinfo.changes
index 0f7ca36..30695c8 100644
--- a/texinfo.changes
+++ b/texinfo.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 22 09:04:35 UTC 2010 - giecrilj@stegny.2a.pl
+
+- Fix variable types (bnc#640417)
+
 -------------------------------------------------------------------
 Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de
 
diff --git a/texinfo.spec b/texinfo.spec
index 8397a85..154f8bf 100644
--- a/texinfo.spec
+++ b/texinfo.spec
@@ -23,7 +23,7 @@ License:        GPLv2+ ; GPLv3+
 Group:          Productivity/Publishing/Texinfo
 AutoReqProv:    on
 Version:        4.13a
-Release:        4
+Release:        11
 %global         version_t2h 1.82
 %global         version_t2r 2.0
 Summary:        Tools Needed to Create Documentation from Texinfo Sources
@@ -42,6 +42,7 @@ Patch3:         texi2roff.patch.bz2
 Patch4:         texinfo-4.12-zlib.patch
 Patch5:         texinfo-4.8-echo.patch
 Patch6:         texi2roff-2.0-gcc4.patch
+Patch7:         texinfo-4.13a-bug640417.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -106,6 +107,7 @@ rm -rf texi2html-%{version_t2h} texi2roff-%{version_t2r}
 %setup -q -b 1 -b 2 -n texinfo-4.13
 %patch4 -p0 -b .zlib
 %patch5 -p0 -b .echo
+%patch7 -p1 -b .size_t
 %patch -p0
 pushd ../texi2html-%{version_t2h}
 %patch1 -p0