diff --git a/manifests/postfix.pp b/manifests/postfix.pp
index 276b79c5609c860a39f4a47c3d795f7b33a05c1a..9944860164e0cf433ea4b918debaa17ba3b6011b 100644
--- a/manifests/postfix.pp
+++ b/manifests/postfix.pp
@@ -54,11 +54,16 @@ class base::postfix {
     '/etc/postfix/recipients':
       ensure  => present;
     '/etc/postfix/senders':
-      content => "root@stanford.edu root@${::hostname}\n";
+      ensure  => present;
     '/etc/postfix/transport':
       source  => 'puppet:///modules/base/postfix/etc/postfix/transport';
   }
 
+  # Have mail from root@stanford.edu come from root at the local system
+  base::postfix::sender { 'root@stanford.edu':
+    ensure => "root@${::hostname}";
+  }
+
   # We used to disable and stop sendmail here on Red Hat, but this doesn't
   # work if sendmail is not installed.  Since we'd rather not have sendmail
   # installed, just assume that people are doing this manually.