diff -Nru samba-4.11.5+dfsg/debian/changelog samba-4.11.5+dfsg/debian/changelog
--- samba-4.11.5+dfsg/debian/changelog	2020-01-28 06:19:46.000000000 +0000
+++ samba-4.11.5+dfsg/debian/changelog	2020-03-31 01:02:39.000000000 +0000
@@ -1,3 +1,9 @@
+samba (2:4.11.5+dfsg-1+rpi1) bullseye-staging; urgency=medium
+
+  * Remove include of stropts.h that no longer exists (See debian bug 954582 )
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 31 Mar 2020 01:02:39 +0000
+
 samba (2:4.11.5+dfsg-1) unstable; urgency=medium
 
   * New upstream security release
diff -Nru samba-4.11.5+dfsg/debian/patches/remove-stropts-include samba-4.11.5+dfsg/debian/patches/remove-stropts-include
--- samba-4.11.5+dfsg/debian/patches/remove-stropts-include	1970-01-01 00:00:00.000000000 +0000
+++ samba-4.11.5+dfsg/debian/patches/remove-stropts-include	2020-03-31 01:02:39.000000000 +0000
@@ -0,0 +1,16 @@
+Description:  Remove include of stropts.h that no longer exists (See debian bug 954582 )
+Author: Peter Michael Green <plugwash@raspbian.org>
+
+--- samba-4.11.5+dfsg.orig/lib/replace/system/network.h
++++ samba-4.11.5+dfsg/lib/replace/system/network.h
+@@ -87,10 +87,6 @@
+ #include <sys/uio.h>
+ #endif
+ 
+-#ifdef HAVE_STROPTS_H
+-#include <stropts.h>
+-#endif
+-
+ #ifndef HAVE_SOCKLEN_T
+ #define HAVE_SOCKLEN_T
+ typedef int socklen_t;
diff -Nru samba-4.11.5+dfsg/debian/patches/series samba-4.11.5+dfsg/debian/patches/series
--- samba-4.11.5+dfsg/debian/patches/series	2019-12-15 21:02:45.000000000 +0000
+++ samba-4.11.5+dfsg/debian/patches/series	2020-03-31 01:02:39.000000000 +0000
@@ -11,3 +11,4 @@
 build-Remove-tests-for-getdents-and-getdirentries.patch
 wscript-remove-all-checks-for-_FUNC-and-__FUNC.patch
 wscript-split-function-check-to-one-per-line-and-sor.patch
+remove-stropts-include