diff --git a/xrdp-mkpamrules-support-usr-etc-distconfdir.patch b/xrdp-mkpamrules-support-usr-etc-distconfdir.patch
new file mode 100644
index 0000000..c043e78
--- /dev/null
+++ b/xrdp-mkpamrules-support-usr-etc-distconfdir.patch
@@ -0,0 +1,24 @@
+Index: xrdp-0.9.11/instfiles/pam.d/mkpamrules
+===================================================================
+--- xrdp-0.9.11.orig/instfiles/pam.d/mkpamrules
++++ xrdp-0.9.11/instfiles/pam.d/mkpamrules
+@@ -8,6 +8,7 @@ outfile="$3"
+ 
+ service="xrdp-sesman"
+ pamdir="/etc/pam.d"
++pamdir_suse="/usr/etc/pam.d"
+ 
+ guess_rules ()
+ {
+@@ -16,6 +17,11 @@ guess_rules ()
+     return
+   fi
+ 
++  if test -s "$pamdir_suse/common-account"; then
++    rules="suse"
++    return
++  fi
++
+   if test -s "$pamdir/common-account"; then
+     if grep "^@include" "$pamdir/passwd" >/dev/null 2>&1; then
+       rules="debian"
diff --git a/xrdp.changes b/xrdp.changes
index a9a7a61..2c6f07b 100644
--- a/xrdp.changes
+++ b/xrdp.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Nov 13 03:23:15 UTC 2019 - Yifan Jiang <yfjiang@suse.com>
+
+- Make mkpamrules additionally support SUSE's usage of
+  /usr/etc/pam.d (boo#1156094, gh#neutrinolabs/xrdp!1442):
+
+  https://lists.opensuse.org/opensuse-factory/2019-08/msg00113.html
+
 -------------------------------------------------------------------
 Mon Sep 16 03:34:10 UTC 2019 - Felix Zhang <fezhang@suse.com>
 
diff --git a/xrdp.spec b/xrdp.spec
index b6a6d36..35e63e3 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -54,6 +54,8 @@ Patch13:        xrdp-bsc965647-allow-admin-choose-desktop.patch
 Patch14:        xrdp-fate318398-change-expired-password.patch
 # PATCH-FEATURE-SLE xrdp-fate319683-allow-vnc-resizing.patch fate#319683 bsc#948062 - fezhang@suse.com -- allow resizing in VNC sessions.
 Patch15:        xrdp-fate319683-allow-vnc-resizing.patch
+# PATCH-FIX-UPSTREAM xrdp-mkpamrules-support-usr-etc-distconfdir.patch boo#1156094 gh#neutrinolabs/xrdp!1442 - yfjiang@suse.com -- Probe both /usr/etc/pam.d and /etc/pam.d when generating the xrdp-sesman pam rule.
+Patch16:        xrdp-mkpamrules-support-usr-etc-distconfdir.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  fdupes
@@ -112,6 +114,7 @@ This package contains libraries for the JPEG2000 codec for RDP.
 %patch14 -p1
 %patch15 -p1
 %endif
+%patch16 -p1
 
 %build
 sh ./bootstrap