diff -ruN rancid-2.3.8~/bin/control_rancid.in rancid-2.3.8/bin/control_rancid.in
--- rancid-2.3.8~/bin/control_rancid.in
+++ rancid-2.3.8/bin/control_rancid.in
@@ -146,7 +146,7 @@
 	echo ""
 	echo "$DIR does not exist."
 	echo "Run bin/rancid-cvs $GROUP to make all of the needed directories."
-    ) | sendmail -t
+    ) | sendmail -t $MAILOPTS
     exit 1
 fi
 cd $DIR
@@ -187,7 +187,7 @@
 	echo "$MAILHEADERS" | awk '{L = "";LN = $0;while (LN ~ /\\n/) { I = index(LN,"\\n");L = L substr(LN,0,I-1) "\n";LN = substr(LN,I+2,length(LN)-I-1);}print L LN;}'
 	echo ""
 	echo "$DIR/router.db does not exist."
-    ) | sendmail -t
+    ) | sendmail -t $MAILOPTS
     exit 1;
 fi
 
@@ -273,7 +273,7 @@
 	  echo "$MAILHEADERS" | awk '{L = "";LN = $0;while (LN ~ /\\n/) { I = index(LN,"\\n");L = L substr(LN,0,I-1) "\n";LN = substr(LN,I+2,length(LN)-I-1);}print L LN;}'
 	  echo ""
 	  cat routers.mail
-	) | sendmail -t
+	) | sendmail -t $MAILOPTS
     fi
     rm -f routers.mail
 
@@ -478,7 +478,7 @@
 	  echo "$MAILHEADERS" | awk '{L = "";LN = $0;while (LN ~ /\\n/) { I = index(LN,"\\n");L = L substr(LN,0,I-1) "\n";LN = substr(LN,I+2,length(LN)-I-1);}print L LN;}'
 	  echo ""
 	  cat $TMP.diff
-	) | sendmail -t
+	) | sendmail -t $MAILOPTS
 fi
 
 # If any machines have not been reached within the last $OLDTIME
@@ -500,7 +500,7 @@
 	  echo "more than $OLDTIME hours."
 
 	  cat $DIR/routers.failed
-	) | sendmail -t
+	) | sendmail -t $MAILOPTS
 fi
 
 # Cleanup
diff -ruN rancid-2.3.8~/bin/rancid-run.in rancid-2.3.8/bin/rancid-run.in
--- rancid-2.3.8~/bin/rancid-run.in
+++ rancid-2.3.8/bin/rancid-run.in
@@ -156,7 +156,7 @@
 rancid $GROUP hung on `hostname`?  Old lockfile still exists:
 `ls -l $LOCKFILE`
 END
-		) | sendmail -t
+		) | sendmail -t $MAILOPTS
 	    fi
 	    rm -f $TMPDIR/.$GROUP.old
 	else
diff -ruN rancid-2.3.8~/etc/rancid.conf.sample.in rancid-2.3.8/etc/rancid.conf.sample.in
--- rancid-2.3.8~/etc/rancid.conf.sample.in
+++ rancid-2.3.8/etc/rancid.conf.sample.in
@@ -93,3 +93,6 @@
 # it to "" or adding X- style headers.  Individual headers must be separated
 # by a \n.
 #MAILHEADERS="Precedence: bulk"; export MAILHEADERS
+#
+# Additional options for sendmail(8).
+#MAILOPTS="-f bounces.go.here@example.com"; export MAILOPTS
diff -ruN rancid-2.3.8~/man/rancid.conf.5.in rancid-2.3.8/man/rancid.conf.5.in
--- rancid-2.3.8~/man/rancid.conf.5.in
+++ rancid-2.3.8/man/rancid.conf.5.in
@@ -144,6 +144,14 @@
 Example: Precedence: bulk\\nX-clamation: beef cake
 .\"
 .TP
+.B MAILOPTS
+Define additional options used to invoke
+.BR sendmail (8).
+By default, this is not set.
+.sp
+Example: MAILOPTS="-f bounces.go.here@example.com"
+.\"
+.TP
 .B MAX_ROUNDS
 Defines how many times rancid should retry collection of devices that fail.
 The minimum is 1.
diff -ruN rancid-2.3.8~/share/downreport.in rancid-2.3.8/share/downreport.in
--- rancid-2.3.8~/share/downreport.in
+++ rancid-2.3.8/share/downreport.in
@@ -102,6 +102,6 @@
 
       )
     fi
-  ) | sendmail -t
+  ) | sendmail -t $MAILOPTS
 
 done
