diff --git a/emacs.spec b/emacs.spec
index cf9ba0a..141ac2f 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -3,7 +3,7 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 23.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -394,9 +394,13 @@ update-desktop-database &> /dev/null || :
 %config(noreplace) %{_sysconfdir}/skel/.emacs
 %config(noreplace) %{_sysconfdir}/rpm/macros.emacs
 %doc etc/NEWS BUGS README etc/COPYING
-%exclude %{_bindir}/emacs-*
-%{_bindir}/*
-%exclude %{_bindir}/emacs
+%{_bindir}/b2m
+%{_bindir}/ebrowse
+%{_bindir}/emacsclient
+%{_bindir}/etags.emacs
+%{_bindir}/gctags
+%{_bindir}/grep-changelog
+%{_bindir}/rcs-checkin
 %{_mandir}/*/*
 %{_infodir}/*
 %dir %{_datadir}/emacs/%{version}
@@ -422,6 +426,10 @@ update-desktop-database &> /dev/null || :
 %dir %{_datadir}/emacs/site-lisp/site-start.d
 
 %changelog
+* Thu May 26 2011 Karel Klíč <kklic@redhat.com> - 1:23.3-6
+- Enumerate binaries in emacs-common to avoid packaging single binary
+  multiple times by accident
+
 * Mon May 23 2011 Karel Klíč <kklic@redhat.com> - 1:23.3-5
 - Removed %%defattr from %%files sections, as RPM no longer needs it
 - Removed %%dir %%{_libexecdir}/emacs and similar from emacs and