--- config/netatalk.conf.orig	2010-04-19 11:35:26.000000000 +0000
+++ config/netatalk.conf	2010-05-20 19:14:32.000000000 +0000
@@ -1,4 +1,5 @@
-# Netatalk configuration
+# netatalk configuration
+# For details see man netatalk.conf
 # Change this to increase the maximum number of clients that can connect:
 AFPD_MAX_CLIENTS=20
 
@@ -6,7 +7,7 @@
 # NOTE: if your zone has spaces in it, you're better off specifying
 #       it in afpd.conf
 #ATALK_ZONE=@zone
-ATALK_NAME=`echo ${HOSTNAME}|cut -d. -f1`
+ATALK_NAME=`/bin/hostname -s`
 
 # specify the Mac and unix charsets to be used
 ATALK_MAC_CHARSET='MAC_ROMAN'
@@ -20,24 +21,5 @@
 # Change this to set the id of the guest user
 AFPD_GUEST=nobody
 
-# Set which daemons to run.
-# If you need legacy AppleTalk, run atalkd.
-# papd, timelord and a2boot are dependent upon atalkd.
-# If you use "AFP over TCP" server only, run only cnid_metad and afpd.
-ATALKD_RUN=no
-PAPD_RUN=no
-TIMELORD_RUN=no
-A2BOOT_RUN=no
-CNID_METAD_RUN=yes
-AFPD_RUN=yes
-
-# Control whether the daemons are started in the background.
-# If it is dissatisfied that atalkd starts slowly, set "yes".
-ATALK_BGROUND=no
-
-# export the charsets, read form ENV by apps
-export ATALK_MAC_CHARSET
-export ATALK_UNIX_CHARSET
-
 # config for cnid_metad. Default log config:
 # CNID_CONFIG="-l log_note"