diff --git a/manifests/rhsm_reconfigure_script.pp b/manifests/rhsm_reconfigure_script.pp
index 42216ac9..4e564cb5 100644
--- a/manifests/rhsm_reconfigure_script.pp
+++ b/manifests/rhsm_reconfigure_script.pp
@@ -5,13 +5,13 @@
     group => 'root',
     mode  => '0755',
   }
-  
+
   concat::fragment { "${title}+script_start":
     target  => $title,
     content => "#!/bin/bash\n\n",
     order   => '01',
   }
-  
+
   concat::fragment { "${title}+default_ca_data":
     target  => $title,
     content => "read -r -d '' KATELLO_DEFAULT_CA_DATA << EOM\n",
@@ -29,7 +29,7 @@
     content => "EOM\n\n",
     order   => '04',
   }
-  
+
   concat::fragment { "${title}+server_ca_data":
     target  => $title,
     content => "read -r -d '' KATELLO_SERVER_CA_DATA << EOM\n",
diff --git a/templates/rhsm-katello-reconfigure.erb b/templates/rhsm-katello-reconfigure.erb
index 0061098e..143d682b 100755
--- a/templates/rhsm-katello-reconfigure.erb
+++ b/templates/rhsm-katello-reconfigure.erb
@@ -95,6 +95,11 @@ fi
   service goferd status >/dev/null && \
   service goferd restart >/dev/null 2&>1
 
+
+if [ -d /etc/rhsm/facts/ ]; then
+  echo "{\"network.hostname-override\":\"`hostname -f`\"}" > /etc/rhsm/facts/katello.facts
+fi
+
 exit 0
 
 # vim:sw=2:ts=2:et: