diff --git a/.pct-helpers b/.pct-helpers
index 17deb18..c0b2918 100644
--- a/.pct-helpers
+++ b/.pct-helpers
@@ -119,7 +119,9 @@ fillsection(){ (
 
 ct2hostname(){
 	local ct=${CT_DIR}/${1}.conf
-	local host=$(cat $ct | grep hostname | head -1)
+	local host=$(cat $ct \
+		| grep -e '^\s*hostname:' \
+		| head -1)
 	echo ${host/hostname: /}
 }
 
diff --git a/host/make.sh b/host/make.sh
index 25a73df..1fda86d 100755
--- a/host/make.sh
+++ b/host/make.sh
@@ -106,6 +106,9 @@ echo "# Building config..."
 buildAssets
 
 
+# XXX /etc/hosts???
+
+
 # DNS
 if xreadYes "# Update DNS?" DNS ; then
 	file=/etc/resolv.conf