diff --git a/lib/facter/swh_hostname.rb b/lib/facter/swh_hostname.rb
index be1a4de..77e38dd 100644
--- a/lib/facter/swh_hostname.rb
+++ b/lib/facter/swh_hostname.rb
@@ -1,12 +1,19 @@
 require 'puppet'
 require 'socket'
 
+domain_name = ".internal.softwareheritage.org"
+
 Facter.add(:swh_hostname) do
 	setcode do
 		retval = {}
-		retval["short"] = Socket.gethostname
-		retval["internal_fqdn"] = retval["short"] + ".internal.softwareheritage.org"
 		retval["fqdn"] = Facter.value(:fqdn).to_s
+    if retval["fqdn"].end_with?(domain_name)
+      retval["short"] = retval["fqdn"].chomp(domain_name)
+      retval["internal_fqdn"] = retval["fqdn"]
+    else
+		  retval["short"] = Socket.gethostname
+		  retval["internal_fqdn"] = retval["short"] + domain_name
+    end
 		retval
 	end
 end