diff --git a/tcsh.spec b/tcsh.spec
index 2eb5009..d6e22a9 100644
--- a/tcsh.spec
+++ b/tcsh.spec
@@ -1,13 +1,37 @@
-Summary: An enhanced version of csh, the C shell
 Name: tcsh
+Summary: An enhanced version of csh, the C shell
 Version: 6.19.00
 Release: 5%{?dist}
 License: BSD
 Group: System Environment/Shells
+URL: http://www.tcsh.org/
+
+Provides: csh = %{version}
+Provides: /bin/csh
+Provides: /bin/tcsh
+Requires(post): grep
+Requires(postun): grep
+Requires(postun): coreutils
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: gettext-devel
+BuildRequires: git
+BuildRequires: ncurses-devel
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 Source: ftp://ftp.astron.com/pub/tcsh/%{name}-%{version}.tar.gz
 
-# Those patches should be given in git format-patch (no need to comment here)
+# NOTE: 'autosetup' macro (below) uses 'git' for applying the patches:
+#       ->> All the patches should be provided in 'git format-patch' format.
+#       ->> Auxiliary repository will be created during 'fedpkg prep', you
+#           can see all the applied patches there via 'git log'.
 
+# Upstream patches -- official upstream patches released by upstream since the
+# ----------------    last rebase that are necessary for any reason:
+
+
+# Downstream patches -- these should be always included when doing rebase:
+# ------------------
 Patch1:  tcsh-6.15.00-closem.patch
 Patch3:  tcsh-6.14.00-unprintable.patch
 Patch4:  tcsh-6.15.00-hist-sub.patch
@@ -21,13 +45,6 @@ Patch38: tcsh-6.18.01-skip-tty-tests.patch
 # Proposed upstream - http://mx.gw.com/pipermail/tcsh-bugs/2015-May/000944.html
 Patch39: tcsh-6.19.00-gcc5-calloc.patch
 
-Provides: csh = %{version}
-Provides: /bin/tcsh, /bin/csh
-Requires(post): grep
-Requires(postun): coreutils, grep
-URL: http://www.tcsh.org/
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: autoconf, automake, ncurses-devel, gettext-devel, git
 
 
 %description