diff --git a/tcsh.spec b/tcsh.spec
index 5e23c40..d35c212 100644
--- a/tcsh.spec
+++ b/tcsh.spec
@@ -53,14 +53,20 @@ spelling correction, a history mechanism, job control and a C language
 like syntax.
 
 
+# Call the 'autosetup' macro to prepare the environment, but do not patch the
+# source code yet -- we need to convert the 'Fixes' and 'Wishlist' files first:
 %prep
+%autosetup -N -S git
+
 for i in Fixes WishList; do
  iconv -f iso-8859-1 -t utf-8 "$i" > "${i}_" && \
  touch -r "$i" "${i}_" && \
  mv "${i}_" "$i"
 done
 
-%autosetup -p1 -S git
+# Amend the converted files to the initial commit, and patch the source code:
+git commit --all --amend --no-edit > /dev/null
+%autopatch -p1
 
 
 %build