2 files changed, 3 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index ed90f6561..af04c72d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ openssh (1:5.3p1-1) UNRELEASED; urgency=low
       ...) when the agent refuses the constrained add request. This was a
       useful migration measure back in 2002 when constraints were new, but
       just adds risk now (LP: #209447).
+  * Drop change from 1:3.8p1-3 to avoid setresuid() and setresgid() system
+    calls.  This only applied to Linux 2.2, which it's no longer feasible to
+    run anyway (see 1:5.2p1-2 changelog).
 
  -- Colin Watson <cjwatson@debian.org>  Sun, 24 Jan 2010 22:32:25 +0000
 
diff --git a/debian/rules b/debian/rules
index 618525636..09b8771b1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -119,10 +119,6 @@ build-deb-stamp:
         mkdir -p build-deb
         cd build-deb && ../configure $(confflags)
 
-ifeq ($(DEB_HOST_ARCH_OS),linux)
-        # Some 2.2 kernels have trouble with setres[ug]id() (bug #239999).
-        perl -pi -e 's/.*#undef (BROKEN_SETRES[UG]ID).*/#define $$1 1/' build-deb/config.h
-endif
         # Debian's /var/log/btmp has inappropriate permissions.
         perl -pi -e 's,.*#define USE_BTMP .*,/* #undef USE_BTMP */,' build-deb/config.h