diff --git a/grub2.changes b/grub2.changes
index d0d71b6..0c3e762 100644
--- a/grub2.changes
+++ b/grub2.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Apr  3 17:56:20 UTC 2013 - arvidjaar@gmail.com
+
+- update rename-grub-info-file-to-grub2.patch
+  * do not rename docs/grub2.texi here, do it in %%prep (we do it there
+    conditionally already). It simplifies patch refreshing using quilt
+    which does not support file rename.
+
 -------------------------------------------------------------------
 Wed Apr  3 06:55:52 UTC 2013 - mchang@suse.com
 
diff --git a/grub2.spec b/grub2.spec
index 754337c..5ad50bf 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -221,10 +221,9 @@ provides support for EFI systems.
 (cd po && ls *.po | cut -d. -f1 | xargs) >po/LINGUAS
 %patch0 -p1
 %patch1 -p1
-# Workaround SLE11's patch utility did not rename the file for us
-%if 0%{?suse_version} == 1110
+# This simplifies patch handling without need to use git to create patch
+# that renames file
 mv docs/grub.texi docs/grub2.texi
-%endif
 %patch2 -p1
 %patch3 -p1
 %patch6 -p1
diff --git a/rename-grub-info-file-to-grub2.patch b/rename-grub-info-file-to-grub2.patch
index 7af7aef..8c44daa 100644
--- a/rename-grub-info-file-to-grub2.patch
+++ b/rename-grub-info-file-to-grub2.patch
@@ -4,6 +4,12 @@ Date: Sun, 24 Jun 2012 15:40:40 +0200
 Subject: [PATCH] rename grub info file to grub2
 
 Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
+
+From: Andrey Borzenkov <arvidjaar@gmail.com>
+Do not rename file here. quilt does not support it and creates the
+whole file if patch needs refreshing. It means that to regenerate two
+files - Makefile.core.am and  Makefile.util.am - it may be necessary to
+manually rename it.
 ---
  docs/Makefile.am               |    2 +-
  docs/Makefile.in               |   46 ++++++++++++++++++++--------------------
@@ -116,12 +122,9 @@ index 217ea7e..49dc477 100644
  
  maintainer-clean-aminfo:
 diff --git a/docs/grub.texi b/docs/grub2.texi
-similarity index 99%
-rename from docs/grub.texi
-rename to docs/grub2.texi
 index 26944ac..fb7fb0e 100644
 --- a/docs/grub.texi
-+++ b/docs/grub2.texi
++++ b/docs/grub.texi
 @@ -1,7 +1,7 @@
  \input texinfo
  @c -*-texinfo-*-