diff --git a/ctags.spec b/ctags.spec
index 9723f2a..f376de6 100644
--- a/ctags.spec
+++ b/ctags.spec
@@ -1,7 +1,7 @@
 Summary: A C programming language indexing and/or cross-reference tool
 Name: ctags
 Version: 5.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -30,6 +30,7 @@ Install ctags if you are going to use your system for C programming.
 Summary: Exuberant Ctags for emacs tag format
 Group: Development/Tools
 Requires: ctags = %{version}-%{release}
+Requires: /usr/sbin/alternatives
 
 %description etags
 This package will generate tags in a format which GNU Emacs understand,
@@ -50,6 +51,19 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 
 make DESTDIR=%{buildroot} install
+pushd %{buildroot}%{_bindir}
+ls -s ctags etags.ctags
+popd
+pushd %{buildroot}%{_mandir}/man1
+ln -s ctags.1.gz etags.ctags.1.gz
+popd
+
+%posttrans etags
+/usr/sbin/alternatives --install /usr/bin/etags emacs.etags /usr/bin/etags.ctags 20 \
+   --slave /usr/share/man/man1/etags.1.gz emacs.etags.man /usr/share/man/man1/ctags.1.gz
+
+%postun etags
+/usr/sbin/alternatives --remove etags /usr/bin/etags.ctags || :
 
 %clean
 rm -rf %{buildroot}
@@ -57,10 +71,19 @@ rm -rf %{buildroot}
 %files
 %defattr(-, root, root, -)
 %doc COPYING EXTENDING.html FAQ NEWS README
-%{_bindir}/*
-%{_mandir}/man1/*
+%{_bindir}/%{name}
+%{_mandir}/man1/%{name}.1*
+
+%files etags
+%defattr(-, root, root, -)
+%doc COPYING
+%{_bindir}/etags.%{name}
+%{_mandir}/man1/etags.%{name}.1*
 
 %changelog
+* Tue Jul 29 2008 Than Ngo <than@redhat.com>  5.7-3
+- add subpackage ctags-etags
+
 * Tue Jul 15 2008 Tom "spot" Callaway <tcallawa@redhat.com> 5.7-2
 - fix license tag