diff --git a/bash-4.0-emacs.patch b/bash-4.0-emacs.patch
new file mode 100644
index 0000000..c94a57d
--- /dev/null
+++ b/bash-4.0-emacs.patch
@@ -0,0 +1,11 @@
+--- bash-4.0/shell.c.orig	2009-10-15 15:57:56.000000000 -0400
++++ bash-4.0/shell.c	2009-10-15 15:58:28.000000000 -0400
+@@ -572,7 +572,7 @@
+ 
+       /* running_under_emacs == 2 for `eterm' */
+       running_under_emacs = (emacs != 0) || (term && STREQN (term, "emacs", 5));
+-      running_under_emacs += term && STREQN (term, "eterm", 5) && strstr (emacs, "term");
++      running_under_emacs += term && STREQN (term, "eterm", 5) && (emacs != 0) && strstr (emacs, "term");
+ 
+       if (running_under_emacs)
+ 	gnu_error_format = 1;
diff --git a/bash.spec b/bash.spec
index 1ed2d41..2da65ea 100644
--- a/bash.spec
+++ b/bash.spec
@@ -3,7 +3,7 @@
 Version: 4.0
 Name: bash
 Summary: The GNU Bourne Again shell
-Release: 8%{?dist}
+Release: 9%{?dist}
 Group: System Environment/Shells
 License: GPLv2+
 Url: http://www.gnu.org/software/bash
@@ -52,7 +52,6 @@ Patch107: bash-2.05b-pgrp_sync.patch
 Patch108: bash-2.05b-readline-oom.patch
 Patch109: bash-2.05b-xcc.patch
 Patch110: bash-3.2-audit.patch
-#Patch111: bash-3.2-rng.patch
 Patch112: bash-3.2-ssh_source_bash.patch
 Patch113: bash-bashbug.patch
 Patch114: bash-cond-rmatch.patch
@@ -60,10 +59,8 @@ Patch115: bash-infotags.patch
 Patch116: bash-requires.patch
 Patch117: bash-setlocale.patch
 Patch118: bash-tty-tests.patch
-#Patch119: bash-ulimit-m.patch
-#Patch120: bash-4.0-no_debug_output.patch
-#Patch121: bash-4.0-shell_pipelines_handling.patch
 Patch122: bash-4.0-key_alloc.patch
+Patch123: bash-4.0-emacs.patch
 
 Requires(post): ncurses-libs
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -129,7 +126,6 @@ This package contains documentation files for %{name}.
 %patch108 -p1 -b .readline_oom
 %patch109 -p1 -b .xcc
 %patch110 -p1 -b .audit
-#%patch111 -p1 -b .rng
 %patch112 -p1 -b .ssh_source_bash
 %patch113 -p1 -b .bashbug
 %patch114 -p1 -b .cond_rmatch
@@ -137,10 +133,8 @@ This package contains documentation files for %{name}.
 %patch116 -p1 -b .requires
 %patch117 -p1 -b .setlocale
 %patch118 -p1 -b .tty_tests
-#%patch119 -p1 -b .ulimit-m
-#%patch120 -p1 -b .no_debug_output
-#%patch121 -p1 -b .pipelines_handling
 %patch122 -p1 -b .key_alloc
+%patch123 -p1 -b .emacs
 
 echo %{version} > _distribution
 echo %{release} > _patchlevel
@@ -304,6 +298,10 @@ fi
 #%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Thu Dec 10 2009 Roman Rakus <rrakus@redhat.com> - 4.0-9
+- Don't segfault when TERM=eterm* and EMCAS is unset (#530911)
+  
+
 * Thu Aug 27 2009 Roman Rakus <rrakus@redhat.com> - 4.0-8
 - alloc memory for key in creation associative array (#518644)