--- a/components/mutt/Makefile	Fri Dec 02 08:58:14 2011 -0800
+++ b/components/mutt/Makefile	Fri Dec 02 16:56:03 2011 -0800
@@ -52,6 +52,11 @@
 CONFIGURE_OPTIONS  +=		--with-wc-funcs
 CONFIGURE_OPTIONS  +=		--with-sasl
 
+# Add in the C compiler information to the muttbug (a.k.a. flea) script.
+COMPONENT_POST_CONFIGURE_ACTION = \
+	$(GSED) -i 's%XXX-CUSAGE-XXX%$(shell $(CC) -V 2>&1 | head -1)%' \
+	$(BUILD_DIR_32)/muttbug.sh 
+
 # common targets
 build:		$(BUILD_32)
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/mutt/patches/7076617-flea-cc.patch	Fri Dec 02 16:56:03 2011 -0800
@@ -0,0 +1,19 @@
+--- mutt-1.5.21/muttbug.sh.in.orig	Thu Dec  1 09:37:14 2011
++++ mutt-1.5.21/muttbug.sh.in	Fri Dec  2 10:52:31 2011
+@@ -251,14 +251,9 @@
+ echo 
+ echo "-- Build environment information"
+ echo
+-echo "(Note: This is the build environment installed on the system"
+-echo "muttbug is run on.  Information may or may not match the environment"
+-echo "used to build mutt.)"
++echo "- C compiler version information"
++echo "XXX-CUSAGE-XXX"
+ echo
+-echo "- gcc version information"
+-echo "@CC@"
+-@CC@ -v 2>&1
+-echo
+ echo "- CFLAGS"
+ echo @CFLAGS@
+ 

--- a/components/mutt/patches/PATCHES.patch	Fri Dec 02 08:58:14 2011 -0800
+++ b/components/mutt/patches/PATCHES.patch	Fri Dec 02 16:56:03 2011 -0800
@@ -1,7 +1,8 @@
 diff -ur mutt-1.5.21.orig/PATCHES mutt-1.5.21/PATCHES
 --- mutt-1.5.21.orig/PATCHES
 +++ mutt-1.5.21/PATCHES
-@@ -1,0 +1,3 @@
+@@ -1,0 +1,4 @@
 +In addition, these upstream defects are fixed:
 +#3288 seg fault in mx_update_context
 +#3392 Whitespace garbage in pager mode
++#3537 flea/muttbug tries to run C compiler with -v option to get the version number