2 files changed, 4 insertions, 3 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index fb217fc22e6..0a4c14cb95c 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -298,9 +298,7 @@ HAVE_SENDTO
 HAVE_SEQPACKET
 HAVE_SETITIMER
 HAVE_SETLOCALE
-HAVE_SETPGID
 HAVE_SETRLIMIT
-HAVE_SETSID
 HAVE_SHARED_GAME_DIR
 HAVE_SHUTDOWN
 HAVE_SIGNED_${GLTYPE}
@@ -432,7 +430,6 @@ PTY_OPEN
 PTY_TTY_NAME_SPRINTF
 PURESIZE
 RUN_TIME_REMAP
-SETPGRP_RELEASES_CTTY
 SETUP_SLAVE_PTY
 SIGALRM
 SIGCHLD
diff --git a/admin/ChangeLog b/admin/ChangeLog
index c48faadab16..496e1c1bb6a 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,5 +1,9 @@
 2012-11-05  Paul Eggert  <eggert@cs.ucla.edu>
 
+        Assume at least POSIX.1-1988 for getpgrp, setpgid, setsid (Bug#12800).
+        * CPP-DEFINES (HAVE_SETPGID, HAVE_SETSID, SETPGRP_RELEASES_CTTY):
+        Remove; obsolete.
+
         Simplify by assuming __fpending.
         * CPP-DEFINES (PENDING_OUTPUT_COUNT): Remove.