diff --git a/ChangeLog b/ChangeLog
index cf6e00f6b..002c88148 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,7 @@
    after the user's groups are established and move the selinux calls into it.
  - (dtucker) [platform.c session.c] Move the AIX setpcred+chroot hack into
    platform.c
+ - (dtucker) [platform.c session.c] Move the BSDI setpgrp into platform.c.
 
 20101025
  - (tim) [openbsd-compat/glob.h] Remove sys/cdefs.h include that came with
diff --git a/platform.c b/platform.c
index 1604f8b59..20b478343 100644
--- a/platform.c
+++ b/platform.c
@@ -1,4 +1,4 @@
-/* $Id: platform.c,v 1.6 2010/11/05 01:41:13 dtucker Exp $ */
+/* $Id: platform.c,v 1.7 2010/11/05 01:45:18 dtucker Exp $ */
 
 /*
  * Copyright (c) 2006 Darren Tucker.  All rights reserved.
@@ -74,6 +74,10 @@ platform_setusercontext(struct passwd *pw)
 	if (getuid() == 0 || geteuid() == 0)
 		solaris_set_default_project(pw);
 #endif
+
+#if defined(HAVE_LOGIN_CAP) && defined (__bsdi__)
+	setpgid(0, 0);
+# endif
 }
 
 /*
diff --git a/session.c b/session.c
index 78e7c5f50..0775d78d2 100644
--- a/session.c
+++ b/session.c
@@ -1476,9 +1476,6 @@ do_setusercontext(struct passwd *pw)
 #endif /* HAVE_CYGWIN */
 	{
 #ifdef HAVE_LOGIN_CAP
-# ifdef __bsdi__
-		setpgid(0, 0);
-# endif
 # ifdef USE_PAM
 		if (options.use_pam) {
 			do_pam_setcred(use_privsep);