diff -Naur bacula-5.0.3.old/src/dird/bacula-dir.conf.in bacula-5.0.3/src/dird/bacula-dir.conf.in
--- bacula-5.0.3.old/src/dird/bacula-dir.conf.in	2011-12-23 13:49:02.779450043 +0100
+++ bacula-5.0.3/src/dird/bacula-dir.conf.in	2011-12-23 13:50:51.664532669 +0100
@@ -154,7 +154,7 @@
 # Client (File Services) to backup
 Client {
   Name = @basename@-fd
-  Address = @hostname@
+  Address = client.example.com
   FDPort = @fd_port@
   Catalog = MyCatalog
   Password = "@fd_password@"          # password for FileDaemon
@@ -169,7 +169,7 @@
 #
 #Client {
 #  Name = @basename@2-fd                
-#  Address = @hostname@2
+#  Address = client.example.com2
 #  FDPort = @fd_port@
 #  Catalog = MyCatalog
 #  Password = "@fd_password@2"         # password for FileDaemon 2
@@ -183,7 +183,7 @@
 Storage {
   Name = File
 # Do not use "localhost" here    
-  Address = @hostname@                # N.B. Use a fully qualified name here
+  Address = storage.example.com                # N.B. Use a fully qualified name here
   SDPort = @sd_port@
   Password = "@sd_password@"
   Device = FileStorage
@@ -196,7 +196,7 @@
 #Storage {
 #  Name = DDS-4    
 #  Do not use "localhost" here
-#  Address = @hostname@                # N.B. Use a fully qualified name here
+#  Address = storage.example.com                # N.B. Use a fully qualified name here
 #  SDPort = @sd_port@
 #  Password = "@sd_password@"          # password for Storage daemon
 #  Device = DDS-4                      # must be same as Device in Storage daemon
@@ -208,7 +208,7 @@
 #Storage {
 #  Name = "8mmDrive"
 #  Do not use "localhost" here
-#  Address = @hostname@                # N.B. Use a fully qualified name here
+#  Address = storage.example.com                # N.B. Use a fully qualified name here
 #  SDPort = @sd_port@
 #  Password = "@sd_password@"
 #  Device = "Exabyte 8mm"
@@ -219,7 +219,7 @@
 #Storage {
 #  Name = "DVD"
 #  Do not use "localhost" here
-#  Address = @hostname@                # N.B. Use a fully qualified name here
+#  Address = storage.example.com                # N.B. Use a fully qualified name here
 #  SDPort = @sd_port@
 #  Password = "@sd_password@"
 #  Device = "DVD Writer"
diff -Naur bacula-5.0.3.old/src/stored/stored.conf.in bacula-5.0.3/src/stored/stored.conf.in
--- bacula-5.0.3.old/src/stored/stored.conf.in	2011-12-23 13:49:02.808450598 +0100
+++ bacula-5.0.3/src/stored/stored.conf.in	2011-12-23 13:53:17.059311129 +0100
@@ -8,7 +8,7 @@
 #
 Storage {
   Name = "Storage daemon"
-  Address = @hostname@
+  Address = storage.example.com
   SDPort = @sd_port@                  # Directors port      
   WorkingDirectory = "@working_dir@"
   Pid Directory = "@piddir@"
@@ -19,7 +19,7 @@
 # List Directors who are permitted to contact Storage daemon
 #
 Director {
-  Name = @hostname@-dir
+  Name = @basename@-dir
   Password = local_storage_password
 }
 
@@ -51,6 +51,6 @@
 
 Messages {
   Name = Standard
-  director = @hostname@-dir = all
+  director = @basename@-dir = all
   operator = @dump_email@ = mount
 }
diff -Naur bacula-5.0.3.old/src/tray-monitor/tray-monitor.conf.in bacula-5.0.3/src/tray-monitor/tray-monitor.conf.in
--- bacula-5.0.3.old/src/tray-monitor/tray-monitor.conf.in	2011-12-23 13:49:02.773449929 +0100
+++ bacula-5.0.3/src/tray-monitor/tray-monitor.conf.in	2011-12-23 13:52:11.090050817 +0100
@@ -10,14 +10,14 @@
    
 Client {
   Name = @basename@-fd
-  Address = @hostname@
+  Address = client.example.com
   FDPort = @fd_port@
   Password = "@mon_fd_password@"          # password for FileDaemon
 }
 
 Storage {
   Name = @basename@-sd
-  Address = @hostname@
+  Address = storage.example.com
   SDPort = @sd_port@
   Password = "@mon_sd_password@"          # password for StorageDaemon
 }
@@ -25,5 +25,5 @@
 Director {
   Name = @basename@-dir
   DIRport = @dir_port@
-  address = @hostname@
+  Address = director.example.com
 }
diff -Naur bacula-5.0.3.old/src/wx-console/bwx-console.conf.in bacula-5.0.3/src/wx-console/bwx-console.conf.in
--- bacula-5.0.3.old/src/wx-console/bwx-console.conf.in	2011-12-23 13:49:02.798450408 +0100
+++ bacula-5.0.3/src/wx-console/bwx-console.conf.in	2011-12-23 13:51:22.208116570 +0100
@@ -5,6 +5,6 @@
 Director {
   Name = @basename@-dir
   DIRport = @dir_port@
-  address = @hostname@
+  address = director.example.com
   Password = "@dir_password@"
 }