diff --git a/manifests/kerberos.pp b/manifests/kerberos.pp
index 44dd72937153638736d9158245233103f9d26ab0..c41dfa0a8fc00b27cbbaad89462ace5ed64937e5 100644
--- a/manifests/kerberos.pp
+++ b/manifests/kerberos.pp
@@ -1,7 +1,42 @@
-# Set up basic Kerberos configuration and allow logins via Kerberos rlogin and
+,# Set up basic Kerberos configuration and allow logins via Kerberos rlogin and
 # company.
+#
+# **********************************************************************
+# NOTE: If you wish to override the file /etc/krb.conf in your own class,
+# and you are using the "source" parameter, be sure to undefine the
+# "content" parameter or you will get an error. Example:
+#
+#   class s_myclass {
+#     include base::kerberos
+#
+#     File['/etc/krb5.conf'] {
+#       source  => 'puppet:///modules/s_accounts/etc/krb5.conf',
+#       content => undef,
+#     }
+#   }
+# **********************************************************************
+#
+#
+# $krb_env: Which kerberos environment to use. Must be one of:
+#   'prod', 'uat', or 'test'.
+#   Default: 'prod'
+#
+# $prefer_tcp: Normal kerberos traffic uses UDP, but some applications
+#   (lookin' at you Java!) work better with TCP. Set this parameter to
+#   "true" to force the client to prefer TCP to UDP.
+#   Default: false
+
+class base::kerberos(
+  $prefer_tcp = false,
+  $krb_env    = 'prod',
+){
+
+  # We only allow the 'prod', 'uat', and 'test' environments.
+  case $krb_env {
+    'prod', 'uat', 'test': {}
+    default: { fail("unrecognized kerberos environment '${krb_env}'") }
+  }
 
-class base::kerberos {
   case $::osfamily {
     'RedHat': {
       package { 'krb5-workstation': ensure => present }
@@ -12,7 +47,7 @@ class base::kerberos {
       # parameterized class that says what type of Kerberos to install.
     }
     default: {
-      err("unsupported OS $::operatingsystem")
+      fail("unsupported OS ${::operatingsystem}")
     }
   }
 
@@ -20,7 +55,9 @@ class base::kerberos {
   if (   ip_in_cidr($::ipaddress, '204.63.224.0/21')
       or ip_in_cidr($::ipaddress, '172.20.224.0/21')
   ) {
-    $drSite = 'yes'
+    $drSite = true
+  } else {
+    $drSite = false
   }
 
   # Basic Kerberos configuration.
diff --git a/templates/kerberos/krb5.conf.erb b/templates/kerberos/krb5.conf.erb
index 12513f2d674725a2eed304d2c57e20d4d54b0196..b3781fc8aba562a5fecfe7042ebb053c4459c093 100644
--- a/templates/kerberos/krb5.conf.erb
+++ b/templates/kerberos/krb5.conf.erb
@@ -50,16 +50,43 @@
     forwardable           = true
     noaddresses           = true
     allow_weak_crypto     = true
+<% if (@prefer_tcp) then -%>
+    udp_preference_limit  = 1
+<% end -%>
 
 [realms]
     stanford.edu = {
-<% if @drSite == "yes" %>        kdc            = kerberos-liv.stanford.edu:88
-<% end %>        kdc            = krb5auth1.stanford.edu:88
+<%
+if (@krb_env == 'uat') then
+-%>
+        kdc            = kerberos-uat.stanford.edu:88
+        master_kdc     = kerberos-uat.stanford.edu:88
+        admin_server   = kerberos-uat.stanford.edu
+        kpasswd_server = kerberos-uat.stanford.edu
+<%
+elsif (@krb_env == 'test') then
+-%>
+        kdc            = kerberos-test.stanford.edu:88
+        master_kdc     = kerberos-test.stanford.edu:88
+        admin_server   = kerberos-test.stanford.edu
+        kpasswd_server = kerberos-test.stanford.edu
+<%
+else
+  if (@drSite) then
+-%>
+        kdc            = kerberos-liv.stanford.edu:88
+<%
+  end
+-%>
+        kdc            = krb5auth1.stanford.edu:88
         kdc            = krb5auth2.stanford.edu:88
         kdc            = krb5auth3.stanford.edu:88
         master_kdc     = krb5auth1.stanford.edu:88
         admin_server   = krb5-admin.stanford.edu
         kpasswd_server = krb5-admin.stanford.edu
+<%
+end
+-%>
         default_domain = stanford.edu
         kadmind_port   = 749
     }