diff --git a/.cvsignore b/.cvsignore
index 6d5e3a2..34ffd77 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
 ctags-5.5.4.tar.gz
 ctags-5.6.tar.gz
+ctags-5.7.tar.gz
diff --git a/ctags.spec b/ctags.spec
index 976eabd..172a11d 100644
--- a/ctags.spec
+++ b/ctags.spec
@@ -1,12 +1,13 @@
-Summary: A C programming language indexing and/or cross-reference tool.
+Summary: A C programming language indexing and/or cross-reference tool
 Name: ctags
-Version: 5.6
-Release: 1.1
+Version: 5.7
+Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
-Source: http://prdownloads.sourceforge.net/ctags/ctags-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0: ctags-5.7-destdir.patch
 URL: http://ctags.sourceforge.net/
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Ctags generates an index (or tag) file of C language objects found in
@@ -25,29 +26,45 @@ objects found in source files.
 
 Install ctags if you are going to use your system for C programming.
 
+%package etags
+Summary: Exuberant Ctags for emacs tag format
+Group: Development/Tools
+Requires: ctags = %{version}-%{release}
+
+%description etags
+This package will generate tags in a format which GNU Emacs understand,
+it's a alternativ implementation of the GNU etags program.
+Note: some command line options is not compatible with GNU etags.
+
+
 %prep
 %setup -q
+%patch0 -p1 -b .destdir
 
 %build
-%configure --disable-etags
+%configure
 
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
 
-%makeinstall
+make DESTDIR=%{buildroot} install
 
 %clean
 rm -rf %{buildroot}
 
 %files
-%defattr(-,root,root)
-%doc COPYING EXTENDING.html FAQ INSTALL NEWS README
+%defattr(-, root, root, -)
+%doc COPYING EXTENDING.html FAQ NEWS README
 %{_bindir}/*
 %{_mandir}/man1/*
 
 %changelog
+* Fri Feb 15 2008 Than Ngo <than@redhat.com> 5.7-1
+- 5.7
+- merge review: ctags
+
 * Mon Jul 17 2006 Nalin Dahyabhai <nalin@redhat.com> 5.6-1.1
 - rebuild
 
@@ -139,11 +156,11 @@ rm -rf %{buildroot}
 * Mon Jun 12 2000 Preston Brown <pbrown@redhat.com>
 - FHS paths
 
-* Mon May  8 2000 Bernhard Rosenkr�nzer <bero@redhat.com>
+* Mon May  8 2000 Bernhard Rosenkränzer <bero@redhat.com>
 - Update to 3.5.2
 - minor cleanups to spec file
 
-* Tue Feb 16 2000 Bernhard Rosenkr�nzer <bero@redhat.com>
+* Tue Feb 16 2000 Bernhard Rosenkränzer <bero@redhat.com>
 - Update to 3.4 to fix bug #9446
 
 * Thu Feb 03 2000 Preston Brown <pbrown@redhat.com>
diff --git a/sources b/sources
index 447e474..cc60aae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9026a6c6950751bc4fd1be37e8a2070f  ctags-5.6.tar.gz
+643cab63b39c8a24377dc4c781547d40  ctags-5.7.tar.gz