diff --git a/dhcp.changes b/dhcp.changes
index c973c7a..fd351f7 100644
--- a/dhcp.changes
+++ b/dhcp.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Feb 22 07:04:56 UTC 2019 - Franck Bui <fbui@suse.com>
+
+- Drop use of $FIRST_ARG in .spec
+
+  The use of $FIRST_ARG was probably required because of the
+  %service_* rpm macros were playing tricks with the shell positional
+  parameters. This is bad practice and error prones so let's assume
+  that no macros should do that anymore and hence it's safe to assume
+  that positional parameters remains unchanged after any rpm macro
+  call.
+
 -------------------------------------------------------------------
 Mon Jan 21 13:33:47 UTC 2019 - Jonathan Brielmaier <jbrielmaier@suse.de>
 
diff --git a/dhcp.spec b/dhcp.spec
index 8fdb2c6..83fff45 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -394,7 +394,7 @@ getent passwd dhcpd >/dev/null || useradd -r -g nogroup -s /bin/false -c "DHCP s
 %service_add_post dhcpd.service
 %service_add_post dhcpd6.service
 # FIXME: update?
-if [ ${FIRST_ARG:-0} -gt 1 ]; then
+if [ $1 -gt 1 ]; then
     if grep -q '^DHCPD_RUN_AS=.*nobody' etc/sysconfig/dhcpd; then
 	tmpfile=$(mktemp -q etc/sysconfig/dhcpd.XXXXXX)
 	sed 's|^DHCPD_RUN_AS=.*|DHCPD_RUN_AS="dhcpd"|' etc/sysconfig/dhcpd \