diff --git a/commons/src/main/java/org/archive/util/InetAddressUtil.java b/commons/src/main/java/org/archive/util/InetAddressUtil.java
index bde3a18a..585ba772 100644
--- a/commons/src/main/java/org/archive/util/InetAddressUtil.java
+++ b/commons/src/main/java/org/archive/util/InetAddressUtil.java
@@ -95,7 +95,7 @@ public class InetAddressUtil {
                 InetAddress ia = ee.nextElement();
                 if (ia != null) {
                     if (ia.getHostName() != null) {
-                        localNames.add(ia.getHostName());
+                        localNames.add(ia.getCanonicalHostName());
                     }
                     if (ia.getHostAddress() !=  null) {
                         localNames.add(ia.getHostAddress());
diff --git a/modules/src/main/java/org/archive/modules/writer/ARCWriterProcessor.java b/modules/src/main/java/org/archive/modules/writer/ARCWriterProcessor.java
index 15310f3b..14c7022e 100644
--- a/modules/src/main/java/org/archive/modules/writer/ARCWriterProcessor.java
+++ b/modules/src/main/java/org/archive/modules/writer/ARCWriterProcessor.java
@@ -209,7 +209,7 @@ public class ARCWriterProcessor extends WriterPoolProcessor {
     
     private static String getHostName() {
         try {
-            return InetAddress.getLocalHost().getHostName();
+            return InetAddress.getLocalHost().getCanonicalHostName();
         } catch (UnknownHostException e) {
             logger.log(Level.SEVERE, "Could not get local host name.", e);
             return "localhost";
diff --git a/modules/src/main/java/org/archive/modules/writer/WARCWriterProcessor.java b/modules/src/main/java/org/archive/modules/writer/WARCWriterProcessor.java
index 047166db..8aa4947f 100644
--- a/modules/src/main/java/org/archive/modules/writer/WARCWriterProcessor.java
+++ b/modules/src/main/java/org/archive/modules/writer/WARCWriterProcessor.java
@@ -514,7 +514,7 @@ public class WARCWriterProcessor extends WriterPoolProcessor {
         try {
             InetAddress host = InetAddress.getLocalHost();
             record.addLabelValue("ip", host.getHostAddress());
-            record.addLabelValue("hostname", host.getHostName());
+            record.addLabelValue("hostname", host.getCanonicalHostName());
         } catch (UnknownHostException e) {
             logger.log(Level.WARNING,"unable top obtain local crawl engine host",e);
         }
diff --git a/modules/src/main/java/org/archive/modules/writer/WriterPoolProcessor.java b/modules/src/main/java/org/archive/modules/writer/WriterPoolProcessor.java
index ad3f7ed5..aa856aef 100644
--- a/modules/src/main/java/org/archive/modules/writer/WriterPoolProcessor.java
+++ b/modules/src/main/java/org/archive/modules/writer/WriterPoolProcessor.java
@@ -437,7 +437,7 @@ implements Lifecycle {
         sfx = sfx.trim();
         if (sfx.contains(WriterPoolMember.HOSTNAME_VARIABLE)) {            String str = "localhost.localdomain";
             try {
-                str = InetAddress.getLocalHost().getHostName();
+                str = InetAddress.getLocalHost().getCanonicalHostName();
             } catch (UnknownHostException ue) {
                 logger.severe("Failed getHostAddress for this host: " + ue);
             }