--- a/dhcpcd.sh	2010-08-28 15:54:28.000000000 -0400
+++ b/dhcpcd.sh	2010-08-29 11:31:49.000000000 -0400
@@ -62,31 +62,47 @@ dhcpcd_stop() {
 dhcpcd_start() {
 	local iface="$1" opts= pidfile="/var/run/dhcpcd-$1.pid"
 	local ifvar=$(bash_variable "${iface}") metric= d=
+	local new=
 
 	interface_exists "${iface}" true || return 1
 
 	# Get our options
-	opts="dhcpcd_${ifvar}"
-	opts="${dhcpcd} ${!opts}"
+	eval opts=\$dhcp_${ifvar}
+	[ -z "${opts}" ] && opts=${dhcp}
+
+	case "$(dhcpcd --version)" in
+		"dhcpcd "[123]*) new=false;;
+		*) new=true;;
+	esac
 
 	# Map some generic options to dhcpcd
-	d="dhcp_${ifvar}"
-	d=" ${!d} "
-	[[ ${d} == "  " ]] && d=" ${dhcp} "
-	[[ ${d} == *" nodns "* ]] && opts="${opts} -R"
-	[[ ${d} == *" nontp "* ]] && opts="${opts} -N"
-	[[ ${d} == *" nonis "* ]] && opts="${opts} -Y"
-	[[ ${d} == *" nogateway "* ]] && opts="${opts} -G"
-	if [[ ${d} == *" nosendhost "* ]] ; then
-		opts="${opts} -h ''"
-	else
-		# We transmit the hostname by default
-		if [[ " ${opts} " != *" -h "* ]]; then
-			local hname=$(hostname)
-			[[ -n ${hname} && ${hname} != "(none)" && ${hname} != "localhost" ]] \
-				&& opts="-h \"${hname}\" ${opts}"
-		fi
-	fi
+	for opt in ${opts}; do
+		case "${opt}" in
+			nodns)
+				if ${new}; then
+					opts="${opts} -C resolv.conf"
+				else
+					opts="${opts} -R"
+				fi
+				;;
+			nontp)
+				if ${new}; then
+					opts="${opts} -C ntp.conf"
+				else
+					opts="${opts} -N"
+				fi
+				;;
+			nonis)
+				if ${new}; then
+					opts="${opts} -C yp.conf"
+				else
+					opts="${opts} -Y"
+				fi
+				;;
+			nogateway) opts="${opts} -G";;
+			nosendhost) opts="${opts} -h ''";
+		esac
+	done
 
 	# Add our route metric
 	metric="metric_${ifvar}"