diff --git a/doc/Changelog b/doc/Changelog
index d9a754af9..398f961e0 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -4,6 +4,7 @@
 	  so that include: file below that is relative to that directory.
 	  With chroot, make the directory an absolute path inside chroot.
 	- keep debug symbols in windows build.
+	- do not delete service.conf on windows uninstall.
 
 9 June 2016: Wouter
 	- Trunk is called 1.5.10 (with previous fixes already in there to 2
diff --git a/winrc/setup.nsi b/winrc/setup.nsi
index 15735933a..d70c56b65 100644
--- a/winrc/setup.nsi
+++ b/winrc/setup.nsi
@@ -188,7 +188,8 @@ section "un.Unbound"
 	Delete "$INSTDIR\anchor-update.exe"
 	Delete "$INSTDIR\unbound-control-setup.cmd"
 	Delete "$INSTDIR\unbound-website.url"
-	Delete "$INSTDIR\service.conf"
+	# keep the service.conf with potential local modifications
+	#Delete "$INSTDIR\service.conf"
 	Delete "$INSTDIR\service.conf.shipped"
 	Delete "$INSTDIR\example.conf"
 	Delete "$INSTDIR\Changelog"