diff --git a/contrib/unbound_munin_ b/contrib/unbound_munin_
index 69e9f3116..df76a9fcf 100755
--- a/contrib/unbound_munin_
+++ b/contrib/unbound_munin_
@@ -150,7 +150,7 @@ get_state ( ) {
 			fi
 		done
 		# try to get it
-		echo $$ >$lock
+		if echo $$ >$lock ; then : ; else break; fi
 	done
 	# do not refetch if the file exists and only LEE seconds old
 	if test -f $state; then
diff --git a/doc/Changelog b/doc/Changelog
index 2dcaa4650..0602700d9 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 29 September 2016: Wouter
 	- Fix #838: 1.5.10 cannot be built on Solaris, undefined PATH_MAX.
 	- Fix #839: Memory grows unexpectedly with large RPZ files.
+	- Fix #840: infinite loop in unbound_munin_ plugin on unowned lockfile.
 
 27 September 2016: Wouter
 	- tag for 1.5.10 release