diff --git a/bind8/CHANGELOG b/bind8/CHANGELOG
index 488a841dd..522d2a39d 100644
--- a/bind8/CHANGELOG
+++ b/bind8/CHANGELOG
@@ -64,3 +64,5 @@ Multiple zones can be deleted and updated when using the icons view.
 ---- Changes since 1.380 ----
 Added buttons for freezing and un-freezing a master zone, for use on systems that also use dynamic DNS. Thanks to Clément Véret for submitting this patch.
 When adding a remote slave zone, the IPs of all other slaves and the master are included in the master IPs list.
+---- Changes since 1.390 ----
+BIND on Windows can now be configured using this module.
diff --git a/bind8/bind8-lib.pl b/bind8/bind8-lib.pl
index babce1141..a04cc28c0 100644
--- a/bind8/bind8-lib.pl
+++ b/bind8/bind8-lib.pl
@@ -1619,13 +1619,20 @@ return 0;
 # an error message on failure.
 sub restart_bind
 {
-if ($config{'restart_cmd'}) {
+if ($config{'restart_cmd'} eq 'restart') {
+	# Stop and start again
+	&stop_bind();
+	return &start_bind();
+	}
+elsif ($config{'restart_cmd'}) {
+	# Custom command
 	local $out = &backquote_logged("$config{'restart_cmd'} 2>&1 </dev/null");
 	if ($?) {
 		return &text('restart_ecmd', "<pre>$out</pre>");
 		}
 	}
 else {
+	# Use signal
 	local $pidfile = &get_pid_file();
 	local $pid = &check_pid_file(&make_chroot($pidfile, 1));
 	if (!$pid) {
diff --git a/bind8/config-windows b/bind8/config-windows
index 5a4f0b886..d0b8b880d 100755
--- a/bind8/config-windows
+++ b/bind8/config-windows
@@ -35,7 +35,7 @@ largezones=0
 auto_chroot=
 pid_file=c:/windows/system32/dns/etc/named.pid
 default_prins=
-restart_cmd=sc stop named
+restart_cmd=restart
 file_perms=
 extra_reverse=
 default_master=
@@ -44,10 +44,10 @@ chroot=
 file_owner=
 named_group=
 this_ip=
-stop_cmd=sc start named
+stop_cmd=sc stop named
 named_user=
 free_nets=
-start_cmd=
+start_cmd=sc start named
 zones_file=
 extra_forward=
 slave_dir=
diff --git a/bind8/config.info b/bind8/config.info
index 1f178b3d6..c27b0420e 100644
--- a/bind8/config.info
+++ b/bind8/config.info
@@ -54,4 +54,4 @@ pid_file=Default PID file location(s),3,/var/run/named.pid
 no_pid_chroot=PID file is under chroot directory?,1,0-Yes,1-No
 start_cmd=Command to start BIND,3,Default
 stop_cmd=Command to stop BIND,3,Just kill process
-restart_cmd=Command to apply BIND configuration,3,Just send HUP signal
+restart_cmd=Command to apply BIND configuration,10,-Just send HUP signal,restart-Stop and restart,Other command