diff --git a/dns/dnscrypt-proxy/Makefile b/dns/dnscrypt-proxy/Makefile
index ef81bb13e..630f1aef2 100644
--- a/dns/dnscrypt-proxy/Makefile
+++ b/dns/dnscrypt-proxy/Makefile
@@ -1,6 +1,6 @@
 PLUGIN_NAME=		dnscrypt-proxy
 PLUGIN_VERSION=		1.12
-PLUGIN_REVISION=	1
+PLUGIN_REVISION=	2
 PLUGIN_COMMENT=		Flexible DNS proxy supporting DNSCrypt and DoH
 PLUGIN_DEPENDS=		dnscrypt-proxy2
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/dns/dnscrypt-proxy/src/etc/inc/plugins.inc.d/dnscryptproxy.inc b/dns/dnscrypt-proxy/src/etc/inc/plugins.inc.d/dnscryptproxy.inc
index 3f3588874..7e3065bb6 100644
--- a/dns/dnscrypt-proxy/src/etc/inc/plugins.inc.d/dnscryptproxy.inc
+++ b/dns/dnscrypt-proxy/src/etc/inc/plugins.inc.d/dnscryptproxy.inc
@@ -1,30 +1,30 @@
 <?php
 
 /*
-    Copyright (C) 2018 Michael Muenz <m.muenz@gmail.com>
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-
-    2. Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-
-    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGE.
-*/
+ * Copyright (C) 2018 Michael Muenz <m.muenz@gmail.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
 
 function dnscryptproxy_enabled()
 {
@@ -32,24 +32,51 @@ function dnscryptproxy_enabled()
     return (string)$model->enabled == '1';
 }
 
+function dnscryptproxy_configure()
+{
+    return [
+        'dns' => ['dnscryptproxy_configure_do'],
+    ];
+}
+
 function dnscryptproxy_services()
 {
-    $services = array();
+    $services = [];
 
     if (!dnscryptproxy_enabled()) {
         return $services;
     }
 
-    $services[] = array(
+    $model = new \OPNsense\Dnscryptproxy\General();
+    $ports = [];
+
+    foreach (explode(',', (string)$model->listen_addresses) as $addrport) {
+        if (preg_match('/^(?:(\[.+\]:)|([\d\.]+:))[\d]+$/', $addrport, $matches)) {
+            $ports[$matches[1]] = 1;
+        }
+    }
+
+    $services[] = [
         'description' => gettext('DNSCrypt-Proxy'),
-        'configd' => array(
-            'restart' => array('dnscryptproxy restart'),
-            'start' => array('dnscryptproxy start'),
-            'stop' => array('dnscryptproxy stop'),
-        ),
+        'configd' => [
+            'restart' => ['dnscryptproxy restart'],
+            'start' => ['dnscryptproxy start'],
+            'stop' => ['dnscryptproxy stop'],
+        ],
+        'pid' => '/var/run/dnscrypt-proxy.pid',
+        'ports' => array_keys($ports),
         'name' => 'dnscrypt-proxy',
-        'pid' => '/var/run/dnscrypt-proxy.pid'
-    );
+    ];
 
     return $services;
 }
+
+function dnscryptproxy_configure_do($verbose)
+{
+    service_log('Starting DNSCrypt-Proxy...', $verbose);
+
+    configd_run('template reload OPNsense/Dnscryptproxy');
+    configd_run('dnscryptproxy restart');
+
+    service_log("done.\n", $verbose);
+}