diff --git a/dhcp.spec b/dhcp.spec
index a7cc883..b5bf4b4 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -4,7 +4,7 @@
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  4.0.0
-Release:  21%{?dist}
+Release:  22%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -440,6 +440,10 @@ fi
 %{_libdir}/libdhcp4client.so
 
 %changelog
+* Sun Aug 24 2008 David Cantrell <dcantrell@redhat.com> - 12:4.0.0-22
+- Add missing '[' to dhclient-script (#459860)
+- Correct test statement in add_default_gateway() in dhclient-script (#459860)
+
 * Sat Aug 23 2008 David Cantrell <dcantrell@redhat.com> - 12:4.0.0-21
 - Fix syntax error in dhclient-script (#459860)
 
diff --git a/linux b/linux
index 29d6b1a..ebba6e5 100755
--- a/linux
+++ b/linux
@@ -183,7 +183,7 @@ add_default_gateway() {
     router="${1}"
     metric=""
 
-    if [ $# -gt 1 ] && [ "${2}" -gt 0 ]; then
+    if [ $# -gt 1 ] && [ ${2} -gt 0 ]; then
         metric="metric ${2}"
     fi
 
@@ -215,7 +215,7 @@ dhconfig() {
         ip -family inet link set dev ${interface} down
     fi
 
-    if [ "${REASON}" = "BOUND" ] || "${REASON}" = "REBOOT" ] ||
+    if [ "${reason}" = "BOUND" ] || [ "${reason}" = "REBOOT" ] ||
        [ ! "${old_ip_address}" = "${new_ip_address}" ] ||
        [ ! "${old_subnet_mask}" = "${new_subnet_mask}" ] ||
        [ ! "${old_network_number}" = "${new_network_number}" ] ||