diff --git a/tbku b/tbku
index 370cb48..0ee9dca 100755
--- a/tbku
+++ b/tbku
@@ -3,7 +3,7 @@
 # Copyright (c) 2004-2008, TundraWare Inc., Des Plaines, IL
 # All Rights Reserved.
 # For Updates See:  http://www.tundraware.com/Software/tbku
-# $Id: tbku,v 1.115 2012/06/09 18:17:40 tundra Exp $
+# $Id: tbku,v 1.116 2013/03/30 01:48:11 tundra Exp $
 
 
 #####
@@ -18,6 +18,7 @@
 # system.  If you can't, default to FreeBSD settings.
 
 DATE=`which  date`
+HOSTNAME=`which hostname`
 LS=`which    ls`
 SED=`which   sed`
 TAR=`which   tar`
@@ -25,6 +26,7 @@
 UNAME=`which uname`
 
 DATE=${DATE:-"/bin/date"}
+HOSTNAME=${HOSTNAME:-"/bin/hostname"}
 LS=${LS:-"/bin/ls"}
 SED=${SED:-"/usr/bin/sed"}
 TAR=${TAR:-"/usr/bin/tar"}
@@ -52,7 +54,7 @@
 ###
 
 DATETIME=-`${DATE} "+%Y%m%d"`         # Datestamp used to uniquely ID backups
-MACHINE=`${UNAME} -n`-                # Name of the machine we're on
+MACHINE=`${HOSTNAME} -f`-             # FQDN of the machine we're on
 OSTYPE=`${UNAME} -s`-                 # Operating System Type
 OSREV=`${UNAME} -r`-                  # Operating System Revision Level
 HWTYPE=`${UNAME} -p`                  # Processor Type