diff --git a/AlarmTool.m b/AlarmTool.m
index 5cc55db..8d96f49 100644
--- a/AlarmTool.m
+++ b/AlarmTool.m
@@ -42,11 +42,13 @@
 #import "EcAlarm.h"
 #import "EcProcess.h"
 #import "EcUserDefaults.h"
+#import "EcHost.h"
 
 int
 main()
 {
   NSUserDefaults        *defs;
+  NSDictionary          *dict;
   EcAlarm               *alrm;
   NSArray               *args;
   NSString		*cnam;
@@ -74,6 +76,11 @@ main()
     }
   defs = [NSUserDefaults userDefaultsWithPrefix: pref
                                          strict: EC_DEFAULTS_STRICT];
+  dict = [defs dictionaryForKey: @"WellKnownHostNames"];
+  if (nil != dict)
+    {
+      [NSHost setWellKnownNames: dict];
+    }
 
   args = [[NSProcessInfo processInfo] arguments];
   if ([args containsObject: @"--help"] == YES)
diff --git a/ChangeLog b/ChangeLog
index 97132f4..0b5201c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-08-25  Richard Frith-Macdonald <rfm@gnu.org>
+
+	AlarmTool.m:
+	LogTool.m:
+	Termintate.m:
+	Set up well known hosts at start.
+
 2015-07-21  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* EcProcess.h:
diff --git a/LogTool.m b/LogTool.m
index 83fecb9..626215b 100644
--- a/LogTool.m
+++ b/LogTool.m
@@ -41,11 +41,13 @@
 
 #import "EcProcess.h"
 #import "EcUserDefaults.h"
+#import "EcHost.h"
 
 int
 main()
 {
   NSUserDefaults        *defs;
+  NSDictionary          *dict;
   NSArray               *args;
   NSString              *pref;
   NSString		*host;
@@ -68,6 +70,11 @@ main()
     }
   defs = [NSUserDefaults userDefaultsWithPrefix: pref
                                          strict: EC_DEFAULTS_STRICT];
+  dict = [defs dictionaryForKey: @"WellKnownHostNames"];
+  if (nil != dict)
+    {
+      [NSHost setWellKnownNames: dict];
+    }
 
   args = [[NSProcessInfo processInfo] arguments];
   if ([args containsObject: @"--help"] == YES)
diff --git a/Terminate.m b/Terminate.m
index 8278ab7..f01792b 100644
--- a/Terminate.m
+++ b/Terminate.m
@@ -41,6 +41,7 @@
 
 #import "EcProcess.h"
 #import "EcUserDefaults.h"
+#import "EcHost.h"
 
 
 int
@@ -48,6 +49,7 @@ main()
 {
   CREATE_AUTORELEASE_POOL(arp);
   NSUserDefaults	*defs;
+  NSDictionary          *dict;
   NSString              *pref;
   NSString		*host;
   NSString		*name;
@@ -63,6 +65,11 @@ main()
     }
   defs = [NSUserDefaults userDefaultsWithPrefix: pref
                                          strict: EC_DEFAULTS_STRICT];
+  dict = [defs dictionaryForKey: @"WellKnownHostNames"];
+  if (nil != dict)
+    {
+      [NSHost setWellKnownNames: dict];
+    }
 
   /*
    * Shut down the local command server.