diff --git a/ChangeLog b/ChangeLog
index 4b9a58730..c2fe24735 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
    Aaron Hopkins <aaron@die.net>
  - (djm) Fix incorrect configure handling of --with-rsh-path option. Fix from
    Lutz Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE>
+ - (djm) Fixed undefined variables for OSF SIA. Report from 
+   Baars, Henk <Hendrik.Baars@nl.origin-it.com>
 
 20000702
  - (djm) Fix brace mismatch from Corinna Vinschen <vinschen@cygnus.com>
diff --git a/acconfig.h b/acconfig.h
index b011d0421..af990565c 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -6,6 +6,9 @@
 
 @TOP@
 
+/* Use PIPES instead of a socketpair() */
+#undef USE_PIPES
+
 /* Define if your snprintf is busted */
 #undef BROKEN_SNPRINTF
 
diff --git a/auth1.c b/auth1.c
index 8f2c5a804..d8f2652e3 100644
--- a/auth1.c
+++ b/auth1.c
@@ -26,6 +26,10 @@ RCSID("$OpenBSD: auth1.c,v 1.2 2000/04/29 18:11:52 markus Exp $");
 /* import */
 extern ServerOptions options;
 extern char *forced_command;
+#ifdef HAVE_OSF_SIA
+extern int saved_argc;
+extern char **saved_argv;
+#endif /* HAVE_OSF_SIA */
 
 /*
  * convert ssh auth msg type into description
@@ -146,10 +150,6 @@ do_authloop(struct passwd * pw)
 	unsigned int ulen;
 	int type = 0;
 	void (*authlog) (const char *fmt,...) = verbose;
-#ifdef HAVE_OSF_SIA
-	extern int saved_argc;
-	extern char **saved_argv;
-#endif /* HAVE_OSF_SIA */
 
 	/* Indicate that authentication is needed. */
 	packet_start(SSH_SMSG_FAILURE);