diff --git a/src/callproc.c b/src/callproc.c
index 55d97a69ac02d81b61937cdd03df724c27fcdc41..1436a231d7277c01798aa7a0f73004e8dfd94f4c 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -519,11 +519,13 @@ child_setup (in, out, err, new_argv, set_pgrp, current_dir)
   close (out);
   close (err);
 
-#if defined (USG) && !defined (IRIX)
+#if !defined (IRIX)
+#if defined (USG)
   setpgrp ();			/* No arguments but equivalent in this case */
 #else
   setpgrp (pid, pid);
 #endif /* USG */
+#endif /* IRIX */
   setpgrp_of_tty (pid);
 
 #ifdef vipc
diff --git a/src/m/iris4d.h b/src/m/iris4d.h
index 04b85467b7f1afffc21c9b6b3e385feff353ebb1..06a5e57bd4caae2926e29ca1f4a9a1f55ca8d3b4 100644
--- a/src/m/iris4d.h
+++ b/src/m/iris4d.h
@@ -148,12 +148,12 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #ifdef HAVE_CRTN
 /* Must define START-FILES so that the linker can find /usr/lib/crt0.o.  */
 #define START_FILES pre-crt0.o /usr/lib/crt1.o
-#define LIB_STANDARD -lbsd -lc /usr/lib/crtn.o
+#define LIB_STANDARD -lc /usr/lib/crtn.o
 #else
 #define START_FILES pre-crt0.o /usr/lib/crt0.o
 /* The entry-point label (start of text segment) is `start', not `__start'.  */
 #define DEFAULT_ENTRY_ADDRESS start
-#define LIB_STANDARD -lbsd -lc
+#define LIB_STANDARD -lc
 #endif
 
 /* Use terminfo instead of termcap.  */