diff --git a/emacs-common-ess.spec b/emacs-common-ess.spec
index bfef90a..a045ead 100644
--- a/emacs-common-ess.spec
+++ b/emacs-common-ess.spec
@@ -28,13 +28,14 @@
 
 Name:           emacs-common-%{pkg}
 Version:        5.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        %{pkgname} add-on package for Emacs
 
 Group:          Applications/Editors
 License:        GPLv2+
 URL:            http://ESS.R-project.org/
 Source0:        http://ESS.R-project.org/downloads/ess/ess-%{version}.tgz
+Patch0:         emacs-ess-5.11-fix-site-start.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -112,6 +113,7 @@ XEmacs. You do not need to install this package to run
 
 %prep
 %setup -q -n %{pkg}-%{version}
+%patch0 -p0
 ( cd doc && chmod u+w html info ) # fix perms to ensure builddir can be deleted
 
 %build
@@ -263,6 +265,10 @@ fi
 
 
 %changelog
+* Fri Oct 15 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 5.11-2
+- Add patch to use ".r$" as regex in start start (workaround for problems
+  with XEmacs misidentify Perl scripts as R scripts #631707)
+
 * Sun Jul 18 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 5.11-1
 - Update to upstream 5.11 (#594669)
 
diff --git a/emacs-ess-5.11-fix-site-start.patch b/emacs-ess-5.11-fix-site-start.patch
new file mode 100644
index 0000000..685883a
--- /dev/null
+++ b/emacs-ess-5.11-fix-site-start.patch
@@ -0,0 +1,11 @@
+--- lisp/ess-site.el.orig	2010-10-15 15:34:34.369599632 -0400
++++ lisp/ess-site.el	2010-10-15 15:34:40.968139278 -0400
+@@ -263,7 +263,7 @@
+ (setq interpreter-mode-alist
+       (append
+        '(("Rscript" . r-mode)
+-	 ("r"       . r-mode)
++	 ("r$"       . r-mode)
+ 	 )
+        interpreter-mode-alist))
+