diff --git a/erlang-lfe.spec b/erlang-lfe.spec
index fc4611b..efc4786 100644
--- a/erlang-lfe.spec
+++ b/erlang-lfe.spec
@@ -2,6 +2,13 @@
 %global debug_package %{nil}
 %global git_tag 1bcf461
 
+%if 0%{?el6}%{?fedora}
+%bcond_without emacs
+%else
+%bcond_with emacs
+%endif
+
+%if %{with emacs}
 # If the emacs-el package has installed a pkgconfig file, use that to determine
 # install locations and Emacs version at build time, otherwise set defaults.
 %if %($(pkg-config emacs) ; echo $?)
@@ -13,10 +20,11 @@
 %define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
 %define emacs_startdir %(pkg-config emacs --variable sitestartdir)
 %endif
+%endif
 
 Name:		erlang-%{realname}
 Version:	0.6.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Lisp Flavoured Erlang
 Group:		Development/Languages
 License:	BSD
@@ -25,6 +33,7 @@ Source0:	http://github.com/rvirding/lfe/tarball/v0.6.1/rvirding-%{realname}-v%{v
 Patch1:		erlang-lfe-0001-No-such-option-for-which-s.patch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:	erlang-erts
+%if %{with emacs}
 BuildRequires:	emacs(bin), emacs-el >= 22.1-2
 BuildRequires:	pkgconfig
 #BuildRequires:	erlang-rebar
@@ -32,6 +41,7 @@ BuildRequires:	emacs
 BuildRequires:	xemacs
 BuildRequires:	emacs-el
 BuildRequires:	xemacs-packages-extra-el
+%endif
 
 Requires:	erlang-compiler
 Requires:	erlang-erts
@@ -44,6 +54,7 @@ Lisp Flavoured Erlang, is a lisp syntax front-end to the Erlang
 compiler. Code produced with it is compatible with "normal" Erlang
 code. An LFE evaluator and shell is also included.
 
+%if %{with emacs}
 %package -n emacs-erlang-lfe
 Summary:	Emacs major mode for Lisp Flavoured Erlang
 Group:		Applications/Editors
@@ -65,6 +76,7 @@ This package contains the elisp source files for Lisp Flavoured Erlang
 under GNU Emacs. You do not need to install this package to run
 Lisp Flavoured Erlang. Install the emacs-erlang-lfe package to use
 Lisp Flavoured Erlang with GNU Emacs.
+%endif
 
 
 %prep
@@ -82,18 +94,22 @@ rm emacs/lfe-mode.elc
 
 %build
 make %{?_smp_mflags}
+%if %{with emacs}
 emacs -batch -f batch-byte-compile emacs/lfe-mode.el
+%endif
 
 
 %install
 rm -rf %{buildroot}
 install -p -m 0644 -D ebin/%{realname}.app %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/%{realname}.app
 install -p -m 0644 ebin/%{realname}_*.beam %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/ebin
+%if %{with emacs}
 mkdir -p %{buildroot}%{emacs_lispdir}
 mkdir -p %{buildroot}%{emacs_startdir}
 install -p -m 0644 emacs/lfe-mode.el %{buildroot}%{emacs_lispdir}
 install -p -m 0644 emacs/lfe-mode.elc %{buildroot}%{emacs_lispdir}
 install -p -m 0644 emacs/lfe-start.el %{buildroot}%{emacs_startdir}
+%endif
 
 
 %clean
@@ -103,12 +119,16 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc COPYRIGHT README doc/ examples/
+%if %{without emacs}
+%doc emacs/
+%endif
 %dir %{_libdir}/erlang/lib/%{realname}-%{version}
 %dir %{_libdir}/erlang/lib/%{realname}-%{version}/ebin
 %{_libdir}/erlang/lib/%{realname}-%{version}/ebin/%{realname}.app
 %{_libdir}/erlang/lib/%{realname}-%{version}/ebin/%{realname}_*.beam
 
 
+%if %{with emacs}
 %files -n emacs-erlang-lfe
 %defattr(-,root,root,-)
 %{emacs_startdir}/lfe-start.el
@@ -118,9 +138,13 @@ rm -rf %{buildroot}
 %files -n emacs-erlang-lfe-el
 %defattr(-,root,root,-)
 %{emacs_lispdir}/lfe-mode.el
+%endif
 
 
 %changelog
+* Wed Nov 17 2010 Peter Lemenkov <lemenkov@gmail.com> - 0.6.1-5
+- Make building of emacs sub-packages conditional (and disable on EL-5)
+
 * Sun Nov 14 2010 Peter Lemenkov <lemenkov@gmail.com> - 0.6.1-4
 - Remove duplicated emacs files from docs