diff --git a/debian/changelog b/debian/changelog
index 643997f..bca1119 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+texinfo (4.13.92.dfsg.1-2) UNRELEASED; urgency=low
+
+  * fix displaced cursor on search (Closes: #652204) (texinfo bug #37823)
+
+ -- Norbert Preining <preining@debian.org>  Thu, 20 Dec 2012 07:14:14 +0900
+
 texinfo (4.13.92.dfsg.1-1) experimental; urgency=low
 
   * new upstream test release
diff --git a/debian/patches/series b/debian/patches/series
index b856b7f..dd775e6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 numerical-signal-names
 info_universal_argument
 dont_build_info
+upstream_fix_displaced_cursor
diff --git a/debian/patches/upstream_fix_displaced_cursor b/debian/patches/upstream_fix_displaced_cursor
new file mode 100644
index 0000000..8018ceb
--- /dev/null
+++ b/debian/patches/upstream_fix_displaced_cursor
@@ -0,0 +1,16 @@
+Fix for Debian bug #652204 and texinfo bug #37823
+displaced cursor on search
+---
+ info/window.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- texinfo.orig/info/window.c
++++ texinfo/info/window.c
+@@ -855,6 +855,7 @@
+   calc_closure_expand (&closure);
+   window->line_starts[window->line_count] = NULL;
+   window->log_line_no[window->line_count] = 0;
++  window_line_map_init (window);
+ }
+ 
+ /* Given WINDOW, recalculate the line starts for the node it displays. */