diff --git a/colorgrep.csh b/colorgrep.csh
new file mode 100644
index 0000000..18fed0f
--- /dev/null
+++ b/colorgrep.csh
@@ -0,0 +1 @@
+alias grep 'grep --color=auto'
diff --git a/colorgrep.sh b/colorgrep.sh
new file mode 100644
index 0000000..3de87cc
--- /dev/null
+++ b/colorgrep.sh
@@ -0,0 +1 @@
+alias grep='grep --color=auto' 2>/dev/null
diff --git a/grep.spec b/grep.spec
index 35ed50f..329779d 100644
--- a/grep.spec
+++ b/grep.spec
@@ -3,10 +3,12 @@
 Summary: Pattern matching utilities
 Name: grep
 Version: 2.6.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv3+
 Group: Applications/Text
 Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.xz
+Source1: colorgrep.sh
+Source2: colorgrep.csh
 URL: http://www.gnu.org/software/grep/
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -53,6 +55,8 @@ rm -rf ${RPM_BUILD_ROOT}
 make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT install
 gzip $RPM_BUILD_ROOT%{_infodir}/grep*
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
+install -pm 644 %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 
 %find_lang %name
 
@@ -75,10 +79,15 @@ fi
 %doc ABOUT-NLS AUTHORS THANKS TODO NEWS README ChangeLog COPYING
 
 %{_bindir}/*
+%config(noreplace) %{_sysconfdir}/profile.d/colorgrep.*sh
 %{_infodir}/*.info*.gz
 %{_mandir}/*/*
 
 %changelog
+* Mon Jun 07 2010 Jaroslav Škarvada <jskarvad@redhat.com> - 2.6.3-3
+- Added auto-color profile.d scripts (thanks to Ville Skyttä #600832)
+- Removed description macro from changelog
+
 * Tue May 06 2010 Jaroslav Škarvada <jskarvad@redhat.com> - 2.6.3-2
 - Added dfa-optimize-period patch (speedup for . patterns in UTF-8)
 - Added glibc-matcher-fallback patch (speedup for [a-z] patterns in UTF-8)
@@ -106,7 +115,7 @@ fi
 
 * Wed Feb 10 2010 Jaroslav Škarvada <jskarvad@redhat.com> - 2.5.4-1
 - New version: grep-2.5.4
-- Fixed typos in %description
+- Fixed typos in description
 - Updated utf-8 patch
 - Added dfa-optional patch (#538423)