diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index 2ed4ea9f8..eee2f29f1 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		haproxy
-PLUGIN_VERSION=		2.20
+PLUGIN_VERSION=		2.21
 PLUGIN_COMMENT=		Reliable, high performance TCP/HTTP load balancer
 PLUGIN_DEPENDS=		haproxy
 PLUGIN_MAINTAINER=	opnsense@moov.de
diff --git a/net/haproxy/src/opnsense/scripts/OPNsense/HAProxy/rc-wrapper.sh b/net/haproxy/src/opnsense/scripts/OPNsense/HAProxy/rc-wrapper.sh
index 3ade2075d..017581fc6 100755
--- a/net/haproxy/src/opnsense/scripts/OPNsense/HAProxy/rc-wrapper.sh
+++ b/net/haproxy/src/opnsense/scripts/OPNsense/HAProxy/rc-wrapper.sh
@@ -19,6 +19,13 @@ reload)
         rcprefix="hard"
     fi
     ;;
+restart)
+    # The RC script always performs a "graceful" stop when using the
+    # "restart" command. This behaviour cannot be altered. So we have to
+    # manually perform a "hardstop" now.
+    if [ "${haproxy_hardstop}" == "YES" ]; then
+        /usr/local/etc/rc.d/haproxy hardstop
+    fi
 esac
 
 /usr/local/etc/rc.d/haproxy ${rcprefix}${1}