diff --git a/emacs-23.1-memmove.patch b/emacs-23.1-memmove.patch
new file mode 100644
index 0000000..1e9ac2c
--- /dev/null
+++ b/emacs-23.1-memmove.patch
@@ -0,0 +1,19 @@
+diff -up emacs-23.1/lib-src/etags.c.memmove emacs-23.1/lib-src/etags.c
+--- emacs-23.1/lib-src/etags.c.memmove	2009-06-21 06:37:34.000000000 +0200
++++ emacs-23.1/lib-src/etags.c	2009-12-08 17:55:41.442792036 +0100
+@@ -6695,13 +6695,13 @@ absolute_filename (file, dir)
+ 	      else if (cp[0] != '/')
+ 		cp = slashp;
+ #endif
+-	      strcpy (cp, slashp + 3);
++	      memmove (cp, slashp + 3, strlen(slashp + 2));
+ 	      slashp = cp;
+ 	      continue;
+ 	    }
+ 	  else if (slashp[2] == '/' || slashp[2] == '\0')
+ 	    {
+-	      strcpy (slashp, slashp + 2);
++	      memmove (slashp, slashp + 2, strlen(slashp + 1));
+ 	      continue;
+ 	    }
+ 	}
diff --git a/emacs.spec b/emacs.spec
index de8b1f0..c95b1ec 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 23.1
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -28,9 +28,12 @@ Patch2: po-mode-auto-replace-date-71264.patch
 Patch3: rpm-spec-mode-utc.patch
 Patch4: emacs-gtk.patch
 Patch5: emacs-23.1-xdg.patch
+# Fixed in upstream CVS.
 Patch6: emacs-23.1-cpp.patch
 Patch7: emacs-23.1-scroll.patch
 Patch8: emacs-23.1-indian.patch
+# Fixed in upstream CVS
+Patch9: emacs-23.1-memmove.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: atk-devel, cairo-devel, desktop-file-utils, freetype-devel, fontconfig-devel, dbus-devel, giflib-devel, glibc-devel, gtk2-devel, libpng-devel
@@ -129,6 +132,7 @@ Emacs packages or see some elisp examples.
 %patch6 -p1
 %patch7 -p1 -b .scroll
 %patch8 -p1
+%patch9 -p1 -b .memmove
 
 # install rest of site-lisp files
 ( cd site-lisp
@@ -400,6 +404,9 @@ alternatives --install %{_bindir}/etags emacs.etags %{_bindir}/etags.emacs 80 \
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Tue Dec  8 2009 Karel Klic <kklic@redhat.com> 1:23.1-17
+- Fixed rhbz#545398 - ETags messes up filenames
+
 * Thu Dec 03 2009 Daniel Novotny <dnovotny@redhat.com> 1:23.1-16
 - fix #542657 -  emacs does not display indic text