diff --git a/buildfix.patch b/xrdp-buildfix.patch
similarity index 100%
rename from buildfix.patch
rename to xrdp-buildfix.patch
diff --git a/xrdp.changes b/xrdp.changes
index 3a6bbed..358b96b 100644
--- a/xrdp.changes
+++ b/xrdp.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Sep 18 04:21:28 UTC 2020 - Felix Zhang <fzhang.foss@gmail.com>
+
+- Add xrdp-buildfix.patch: fix a declaration conflict #1691
+
 -------------------------------------------------------------------
 Mon Sep 14 04:04:20 UTC 2020 - Felix Zhang <fzhang.foss@gmail.com>
 
@@ -28,7 +33,6 @@ Mon Sep 14 04:04:20 UTC 2020 - Felix Zhang <fzhang.foss@gmail.com>
 - Rebase xrdp-disable-8-bpp-vnc-support.patch
 - Rebase xrdp-fate318398-change-expired-password.patch
 
--------------------------------------------------------------------
 Fri Jul 10 02:27:32 UTC 2020 - Yifan Jiang <yfjiang@suse.com>
 
 - Update xrdp.keyring according to:
diff --git a/xrdp.spec b/xrdp.spec
index cba7a11..4e2552b 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -52,7 +52,7 @@ Patch12:        xrdp-filter-tab-from-mstsc-on-focus-change.patch
 Patch13:        xrdp-bsc965647-allow-admin-choose-desktop.patch
 # PATCH-FEATURE-SLE xrdp-fate318398-change-expired-password.patch fate#318398 - fezhang@suse.com -- enable user to update expired password via PAM
 Patch14:        xrdp-fate318398-change-expired-password.patch
-Patch16:        buildfix.patch
+Patch16:        xrdp-buildfix.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  fdupes