From 9c47bad86a660488ed815fd80240fd9a76e74e3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@sury.org>
Date: Fri, 26 Apr 2019 13:18:35 +0200
Subject: [PATCH] Add CHANGES and release notes

---
 CHANGES           |  2 ++
 doc/arm/notes.xml | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/CHANGES b/CHANGES
index 335b9b2b02..7a6066f87d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+5239.	[func]		Change the json-c detection to pkg-config. [GL #855]
+
 5238.	[bug]		Fix a possible deadlock in TCP code. [GL #1046]
 
 5237.	[bug]		Recurse to find the root server list with 'dig +trace'.
diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml
index 732da2f8da..95ecf3c79e 100644
--- a/doc/arm/notes.xml
+++ b/doc/arm/notes.xml
@@ -159,6 +159,18 @@
 	  <command>dnssec-checkds</command>.
 	</para>
       </listitem>
+      <listitem>
+	<para>
+	  JSON-C is now the only supported library for enabling JSON
+	  support for BIND statistics. The <command>configure</command>
+	  option has been renamed from <command>--with-libjson</command>
+	  to <command>--with-json-c</command>.  Use
+	  <command>PKG_CONFIG_PATH</command> to specify a custom path to
+	  the <command>json-c</command> library as the new
+	  <command>configure</command> option does not take the library
+	  installation path as an optional argument.
+	</para>
+      </listitem>
     </itemizedlist>
   </section>