From e293a85e24e8a9029c2ca5ce9187607f25a1a108 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 30 Sep 2016 12:19:52 +0200
Subject: [PATCH] changelog for #14148

---
 nixos/doc/manual/release-notes/rl-1609.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-1609.xml b/nixos/doc/manual/release-notes/rl-1609.xml
index b4974a1e26bd..2d042e7c7ff7 100644
--- a/nixos/doc/manual/release-notes/rl-1609.xml
+++ b/nixos/doc/manual/release-notes/rl-1609.xml
@@ -180,12 +180,19 @@ following incompatible changes:</para>
     <para><literal>services.xserver.startGnuPGAgent</literal>
       has been removed due to GnuPG 2.1.x bump. See <link
         xlink:href="https://github.com/NixOS/nixpkgs/commit/5391882ebd781149e213e8817fba6ac3c503740c">
-      how to achieve similar behavior. You might need to
+        how to achieve similar behavior</link>. You might need to
       <literal>pkill gpg-agent</literal> after the upgrade
       to prevent a stale agent being in the way.
     </para>
   </listitem>
 
+  <listitem><para>
+    <link xlink:href="https://github.com/NixOS/nixpkgs/commit/e561edc322d275c3687fec431935095cfc717147">
+    Declarative users could share the uid due to the bug in
+    the script handling conflict resolution.
+    </link>
+  </para></listitem>
+
 </itemizedlist>