diff --git a/which-2.csh b/which-2.csh
new file mode 100755
index 0000000..9648892
--- /dev/null
+++ b/which-2.csh
@@ -0,0 +1,4 @@
+# Initialization script for csh
+
+# export AFS, if you are in AFS environment
+alias which 'alias | /usr/bin/which --tty-only --read-alias --show-dot --show-tilde'
diff --git a/which.spec b/which.spec
index 970fd63..656b27d 100644
--- a/which.spec
+++ b/which.spec
@@ -1,18 +1,18 @@
-Summary: Displays where a particular program in your path is located.
+Summary: Displays where a particular program in your path is located
 Name: which
 Version: 2.16
-Release: 8
+Release: 9%{?dist}
 License: GPL
 Group: Applications/System
 Source0: http://www.xs4all.nl/~carlo17/which/%{name}-%{version}.tar.gz
 Source1: which-2.sh
+Source2: which-2.csh
 Url: http://www.xs4all.nl/~carlo17/which/
 Patch: which-2.13-afs.patch
 Patch1: which-2.14-broken.patch
-Prefix: %{_prefix}
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Prereq: /sbin/install-info
-Prereq: dev
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires(preun): /sbin/install-info
+Requires(post): /sbin/install-info
 
 %description
 The which command shows the full pathname of a specified program, if
@@ -20,20 +20,22 @@ the specified program is in your PATH.
 
 %prep
 %setup -q
+
 %patch -p1 -b .afs
 %patch1 -p1 -b .broken
 
 %build
 %configure
 
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
+
 mkdir -p $RPM_BUILD_ROOT/etc/profile.d
-install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/profile.d
+install -p -m 755 %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT/etc/profile.d/
 
 %post
 /sbin/install-info --quiet --info-dir=%{_infodir} %{_infodir}/which.info.gz > /dev/null 2>&1 || :
@@ -48,13 +50,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc EXAMPLES README AUTHORS NEWS
-%{_bindir}/*
+%doc COPYING AUTHORS LICENSE EXAMPLES README AUTHORS NEWS
 %config /etc/profile.d/which-2.*
+%{_bindir}/*
 %{_infodir}/which.info.gz
 %{_mandir}/*/*
 
 %changelog
+* Mon Apr 23 2007 Than Ngo <than@redhat.com> - 2.16-9.fc7
+- add missing which-2 script for csh
+- cleanup specfile #226539
+
 * Mon Jan 22 2007 Than Ngo <than@redhat.com> - 2.16-8
 - install-info scriptlet failures