diff --git a/README-BEFORE-ADDING-PATCHES b/README-BEFORE-ADDING-PATCHES
index 43eb94c..8259e81 100644
--- a/README-BEFORE-ADDING-PATCHES
+++ b/README-BEFORE-ADDING-PATCHES
@@ -1,13 +1,16 @@
-All patches need to have a patch description header similar to what is used in 
-SUSE kernel git tree. Patches added without this will be reverted.  Thanks.
+All patches need to have a kernel-style patch description header.
 
-From: Name <email>
+PATCHES LACKING THIS OR NOT CORRECTLY FOLLOWING DESCRIPTION BELOW WILL BE
+REJECTED OR REVERTED
+
+From: Joe Smoe <joe@smoe.com>
 Subject: Summary of fix
-Date: date
-References: bnc#xxxxxx (bugzilla reference if applicable)
-Upstream: yes (provide repo/commit-id in description) or no (provide reason)
-Signed-Off-by: Name <email> (same as From: if committer is patch author)
+Date: Date of fix
+References: Bugzilla reference [bsc#xxxx]
+References: URL of relevant discussion thread, opensuse or upstream ML etc
+Git-commit: Full SHA of upstream commit [if applicable]
+Git-repo: [if different from https://github.com/linux-audit/audit-userspace.git]
+Patch-mainline: revision of audit package or explanation if not [i.e v2.8.1 or "queued with maintainer" or "never; because ...." ]
+Signed-Off-by: Joe Smoe <joe@smoe.com>
 
 Short paragraph describing problem/fix.
-
-References to upstream repo-path/commit-id if applicable.
diff --git a/audit-python3.patch b/audit-python3.patch
index 8585c42..ebd0a09 100644
--- a/audit-python3.patch
+++ b/audit-python3.patch
@@ -1,6 +1,8 @@
 From: Tomas Chvatal <tchvatal@suse.com>
+Date: Wed Feb  7 09:26:35 UTC 2018
 Subject: Convert tests to run under python3
-Upsteam: yes 0dc17590 https://github.com/linux-audit/audit-userspace/pull/39
+References: https://github.com/linux-audit/audit-userspace/pull/39
+Patch-mainline: no; pending with maintainer
 
 Adjust auparse_test to run with python3 and python2
 
diff --git a/audit-secondary.changes b/audit-secondary.changes
index b021dcf..a84f1e7 100644
--- a/audit-secondary.changes
+++ b/audit-secondary.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Mar 16 19:44:45 UTC 2018 - tonyj@suse.com
+
+- Change openldap dependency to client only (bsc#1085003)
+- Resolve issue with previous change if both Python2 and Python3 are
+  present, tests were failing as python2 bindings are preferred in this
+  case.
+
 -------------------------------------------------------------------
 Thu Feb 22 11:00:16 UTC 2018 - meissner@suse.com
 
diff --git a/audit-secondary.spec b/audit-secondary.spec
index b9ef03c..d246c5b 100644
--- a/audit-secondary.spec
+++ b/audit-secondary.spec
@@ -38,8 +38,8 @@ BuildRequires:  audit-devel = %{version}
 BuildRequires:  autoconf >= 2.12
 BuildRequires:  gcc-c++
 BuildRequires:  kernel-headers >= 2.6.30
+BuildRequires:  libldapcpp-devel
 BuildRequires:  libtool
-BuildRequires:  openldap2-devel
 BuildRequires:  pkgconfig
 %if %{with python2}
 BuildRequires:  python2-devel
@@ -96,7 +96,6 @@ by python3.
 Summary:        Default plugins for the audit dispatcher
 License:        GPL-2.0-or-later
 Group:          System/Monitoring
-Requires:       openldap2
 
 %description -n audit-audispd-plugins
 The audit-audispd-plugins package contains plugin components for the
@@ -114,8 +113,13 @@ rm -rf audisp/plugins/prelude
 %patch4 -p1
 %patch5 -p1
 
-# fix python env call in tests
+%if %{without python2} && %{with python3}
+# Fix python env call in tests if we only have Python3.
+# If both versions are present, python2 bindings are preferred by the tests and
+# unconditionally using /usr/bin/python3 breaks the tests
+# Probably the correct solution is to run the tests twice if both are present.
 sed -i -e 's:#!/usr/bin/env python:#!/usr/bin/python3:g' auparse/test/auparse_test.py
+%endif
 
 %build
 autoreconf -fi
diff --git a/audit.changes b/audit.changes
index aed8184..4f0c55e 100644
--- a/audit.changes
+++ b/audit.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Mar 16 19:41:29 UTC 2018 - tonyj@suse.com
+
+- Update header in audit-python3.patch
+- Update patch guidelines in README-BEFORE-ADDING-PATCHES
+
 -------------------------------------------------------------------
 Wed Feb  7 09:26:35 UTC 2018 - tchvatal@suse.com