Fix dhcp template

Conflicts:

	CHANGELOG

2 files changed, 4 insertions, 2 deletions

diff --git a/CHANGELOG b/CHANGELOG
index fe79c445..843d64f8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -18,8 +18,10 @@ Cobbler CHANGELOG
 - (FEAT) new snippet for RHN Hosted: keep RHN keys between reinstalls
 
 - placeholder - 1.6.4
-- (BUGF) fix for webui edits on profile page
 - (BUGF) nameserver search paths now handled by network config snippets
+- (BUGF) unicode fix for --template-files feature
+- (BUGF) mod python input fix for repo/profile associations in webapp
+- (BUGF) change "hostname" to "option hostname" in dhcp.template
 
 - Wed Apr 17 2009 - 1.6.3
 - (BUGF) import with datestamp 0 when .discinfo is not found, do not crash
diff --git a/templates/dhcp.template b/templates/dhcp.template
index 0dd92073..7b6b5eb1 100644
--- a/templates/dhcp.template
+++ b/templates/dhcp.template
@@ -45,7 +45,7 @@ group {
             fixed-address $iface.ip_address;
         #end if
         #if $iface.hostname:
-            hostname $iface.hostname;
+            option hostname $iface.hostname;
         #end if
         #if $iface.subnet:
             option subnet-mask $iface.subnet;