diff --git a/mkapachepw.py b/mkapachepw.py
index e9b7a4b..def6a21 100755
--- a/mkapachepw.py
+++ b/mkapachepw.py
@@ -9,7 +9,7 @@
 # Program Information
 
 PROGNAME = "mkapachepw"
-RCSID = "$Id: mkapachepw.py,v 1.103 2005/04/01 22:21:35 root Exp $"
+RCSID = "$Id: mkapachepw.py,v 1.104 2005/04/01 22:30:33 root Exp $"
 VERSION = RCSID.split()[2]
 
 # Copyright Information
@@ -43,6 +43,7 @@
 import grp
 import os
 import pwd
+from socket import getfqdn
 import sys
 import tconfpy
 import time
@@ -231,11 +232,12 @@
 # Files Should Be Read-Only
 
 os.umask(0377)
+TIMESTAMP = "# Created By %s %s On %s At %s\n" % (PROGNAME, VERSION, getfqdn(), time.asctime())
 
 # Group File
 
 grfile = open(GRFILE, "w")
-grfile.write("# Created By %s %s On %s\n" % (PROGNAME, VERSION, time.asctime()))
+grfile.write(TIMESTAMP)
 
 for gid in groups:
     if gid >= STARTGID:
@@ -246,7 +248,7 @@
 # Password File
 
 pwfile = open(PWFILE, "w")
-pwfile.write("# Created By %s %s On %s\n" % (PROGNAME, VERSION, time.asctime()))
+pwfile.write(TIMESTAMP)
 
 for uid in users:
     if uid >= STARTUID: