diff -u openssh-1.2.2-org/Makefile.in openssh-1.2.2/Makefile.in
--- openssh-1.2.2-org/Makefile.in	Thu Jan 27 04:15:48 2000
+++ openssh-1.2.2/Makefile.in	Mon Feb 14 15:14:00 2000
@@ -9,6 +9,7 @@
 piddir=@piddir@
 srcdir=@srcdir@
 top_srcdir=@top_srcdir@
+top_builddir=.
 
 DESTDIR=
 
@@ -20,7 +21,7 @@
 
 CC=@CC@
 PATHS=-DETCDIR=\"$(sysconfdir)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DSSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\"
-CFLAGS=@CFLAGS@ $(PATHS) @DEFS@
+CFLAGS=@CFLAGS@ $(PATHS) @DEFS@ -I$(top_srcdir) -I$(top_builddir)
 EXTRA_TARGETS=@GNOME_ASKPASS@
 LIBS=@LIBS@
 AR=@AR@
diff -u openssh-1.2.2-org/bsd-bindresvport.c openssh-1.2.2/bsd-bindresvport.c
--- openssh-1.2.2-org/bsd-bindresvport.c	Sat Jan 22 08:17:43 2000
+++ openssh-1.2.2/bsd-bindresvport.c	Mon Feb 14 17:17:37 2000
@@ -27,7 +27,7 @@
  * Mountain View, California  94043
  */
 
-#include "config.h"
+#include <config.h>
 
 #ifndef HAVE_BINRESVPORT_AF
 
diff -u openssh-1.2.2-org/bsd-bindresvport.h openssh-1.2.2/bsd-bindresvport.h
--- openssh-1.2.2-org/bsd-bindresvport.h	Fri Jan 14 05:45:47 2000
+++ openssh-1.2.2/bsd-bindresvport.h	Mon Feb 14 17:17:14 2000
@@ -1,7 +1,7 @@
 #ifndef _BSD_BINRESVPORT_H
 #define _BSD_BINRESVPORT_H
 
-#include "config.h"
+#include <config.h>
 
 #ifndef HAVE_BINRESVPORT_AF
 int bindresvport_af(int sd, struct sockaddr *sa, int af);
diff -u openssh-1.2.2-org/bsd-daemon.c openssh-1.2.2/bsd-daemon.c
--- openssh-1.2.2-org/bsd-daemon.c	Sat Nov 20 02:18:40 1999
+++ openssh-1.2.2/bsd-daemon.c	Mon Feb 14 17:17:37 2000
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "config.h"
+#include <config.h>
 
 #ifndef HAVE_DAEMON
 
diff -u openssh-1.2.2-org/bsd-daemon.h openssh-1.2.2/bsd-daemon.h
--- openssh-1.2.2-org/bsd-daemon.h	Fri Nov 19 05:32:34 1999
+++ openssh-1.2.2/bsd-daemon.h	Mon Feb 14 17:17:14 2000
@@ -1,7 +1,7 @@
 #ifndef _BSD_DAEMON_H
 #define _BSD_DAEMON_H
 
-#include "config.h"
+#include <config.h>
 #ifndef HAVE_DAEMON
 int daemon(int nochdir, int noclose);
 #endif /* !HAVE_DAEMON */
diff -u openssh-1.2.2-org/bsd-login.c openssh-1.2.2/bsd-login.c
--- openssh-1.2.2-org/bsd-login.c	Sun Dec 26 00:21:48 1999
+++ openssh-1.2.2/bsd-login.c	Mon Feb 14 17:17:37 2000
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  */
 
-#include "config.h"
+#include <config.h>
 #ifndef HAVE_LOGIN
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff -u openssh-1.2.2-org/bsd-login.h openssh-1.2.2/bsd-login.h
--- openssh-1.2.2-org/bsd-login.h	Sat Dec 25 00:11:29 1999
+++ openssh-1.2.2/bsd-login.h	Mon Feb 14 17:17:14 2000
@@ -1,7 +1,7 @@
 #ifndef _BSD_LOGIN_H
 # define _BSD_LOGIN_H
 
-# include "config.h"
+# include <config.h>
 # ifndef HAVE_LOGIN
 
 #  include <utmp.h>
diff -u openssh-1.2.2-org/bsd-misc.c openssh-1.2.2/bsd-misc.c
--- openssh-1.2.2-org/bsd-misc.c	Sun Jan 23 00:32:03 2000
+++ openssh-1.2.2/bsd-misc.c	Mon Feb 14 17:17:37 2000
@@ -34,7 +34,7 @@
 **
 */
 
-#include "config.h"
+#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff -u openssh-1.2.2-org/bsd-misc.h openssh-1.2.2/bsd-misc.h
--- openssh-1.2.2-org/bsd-misc.h	Thu Jan  6 10:28:41 2000
+++ openssh-1.2.2/bsd-misc.h	Mon Feb 14 17:17:15 2000
@@ -37,7 +37,7 @@
 #ifndef _BSD_MISC_H
 #define _BSD_MISC_H
 
-#include "config.h"
+#include <config.h>
 
 #ifndef HAVE_ARC4RANDOM
 unsigned int arc4random(void);
diff -u openssh-1.2.2-org/bsd-mktemp.c openssh-1.2.2/bsd-mktemp.c
--- openssh-1.2.2-org/bsd-mktemp.c	Wed Dec 29 09:56:30 1999
+++ openssh-1.2.2/bsd-mktemp.c	Mon Feb 14 17:17:37 2000
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  */
 
-#include "config.h"
+#include <config.h>
 
 #ifndef HAVE_MKDTEMP
 
diff -u openssh-1.2.2-org/bsd-mktemp.h openssh-1.2.2/bsd-mktemp.h
--- openssh-1.2.2-org/bsd-mktemp.h	Fri Nov 19 05:32:34 1999
+++ openssh-1.2.2/bsd-mktemp.h	Mon Feb 14 17:17:15 2000
@@ -1,7 +1,7 @@
 #ifndef _BSD_MKTEMP_H
 #define _BSD_MKTEMP_H
 
-#include "config.h"
+#include <config.h>
 #ifndef HAVE_MKDTEMP
 int mkstemps(char *path, int slen);
 int mkstemp(char *path);
diff -u openssh-1.2.2-org/bsd-rresvport.c openssh-1.2.2/bsd-rresvport.c
--- openssh-1.2.2-org/bsd-rresvport.c	Wed Jan 19 03:45:07 2000
+++ openssh-1.2.2/bsd-rresvport.c	Mon Feb 14 17:17:38 2000
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  */
 
-#include "config.h"
+#include <config.h>
 
 #ifndef HAVE_RRESVPORT_AF
 
diff -u openssh-1.2.2-org/bsd-rresvport.h openssh-1.2.2/bsd-rresvport.h
--- openssh-1.2.2-org/bsd-rresvport.h	Fri Jan 14 05:45:48 2000
+++ openssh-1.2.2/bsd-rresvport.h	Mon Feb 14 17:17:15 2000
@@ -1,7 +1,7 @@
 #ifndef _BSD_RRESVPORT_H
 #define _BSD_RRESVPORT_H
 
-#include "config.h"
+#include <config.h>
 
 #ifndef HAVE_RRESVPORT_AF
 int rresvport_af(int *alport, int af);
diff -u openssh-1.2.2-org/bsd-snprintf.c openssh-1.2.2/bsd-snprintf.c
--- openssh-1.2.2-org/bsd-snprintf.c	Sat Jan 22 03:25:13 2000
+++ openssh-1.2.2/bsd-snprintf.c	Mon Feb 14 17:17:38 2000
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
+#include <config.h>
 
 #if !defined(HAVE_SNPRINTF) || !defined(HAVE_VSNPRINTF)
 
diff -u openssh-1.2.2-org/bsd-snprintf.h openssh-1.2.2/bsd-snprintf.h
--- openssh-1.2.2-org/bsd-snprintf.h	Fri Nov 26 02:21:25 1999
+++ openssh-1.2.2/bsd-snprintf.h	Mon Feb 14 17:17:15 2000
@@ -1,7 +1,7 @@
 #ifndef _BSD_SNPRINTF_H
 #define _BSD_SNPRINTF_H
 
-#include "config.h"
+#include <config.h>
 
 #include <sys/types.h> /* For size_t */
 
diff -u openssh-1.2.2-org/bsd-strlcat.c openssh-1.2.2/bsd-strlcat.c
--- openssh-1.2.2-org/bsd-strlcat.c	Mon Nov 22 03:57:07 1999
+++ openssh-1.2.2/bsd-strlcat.c	Mon Feb 14 17:17:38 2000
@@ -27,7 +27,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
+#include <config.h>
 #ifndef HAVE_STRLCAT
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff -u openssh-1.2.2-org/bsd-strlcat.h openssh-1.2.2/bsd-strlcat.h
--- openssh-1.2.2-org/bsd-strlcat.h	Mon Nov 22 03:57:07 1999
+++ openssh-1.2.2/bsd-strlcat.h	Mon Feb 14 17:17:15 2000
@@ -1,7 +1,7 @@
 #ifndef _BSD_STRLCAT_H
 #define _BSD_STRLCAT_H
 
-#include "config.h"
+#include <config.h>
 #ifndef HAVE_STRLCAT
 #include <sys/types.h>
 size_t strlcat(char *dst, const char *src, size_t siz);
diff -u openssh-1.2.2-org/bsd-strlcpy.c openssh-1.2.2/bsd-strlcpy.c
--- openssh-1.2.2-org/bsd-strlcpy.c	Fri Nov 19 05:32:34 1999
+++ openssh-1.2.2/bsd-strlcpy.c	Mon Feb 14 17:17:39 2000
@@ -27,7 +27,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
+#include <config.h>
 #ifndef HAVE_STRLCPY
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff -u openssh-1.2.2-org/bsd-strlcpy.h openssh-1.2.2/bsd-strlcpy.h
--- openssh-1.2.2-org/bsd-strlcpy.h	Fri Nov 19 05:32:34 1999
+++ openssh-1.2.2/bsd-strlcpy.h	Mon Feb 14 17:17:15 2000
@@ -1,7 +1,7 @@
 #ifndef _BSD_STRLCPY_H
 #define _BSD_STRLCPY_H
 
-#include "config.h"
+#include <config.h>
 #ifndef HAVE_STRLCPY
 #include <sys/types.h>
 size_t strlcpy(char *dst, const char *src, size_t siz);
diff -u openssh-1.2.2-org/cipher.c openssh-1.2.2/cipher.c
--- openssh-1.2.2-org/cipher.c	Sun Jan 23 00:32:03 2000
+++ openssh-1.2.2/cipher.c	Mon Feb 14 17:17:39 2000
@@ -16,7 +16,7 @@
 
 #include "ssh.h"
 #include "cipher.h"
-#include "config.h"
+#include <config.h>
 
 #ifdef HAVE_OPENSSL
 #include <openssl/md5.h>
diff -u openssh-1.2.2-org/cipher.h openssh-1.2.2/cipher.h
--- openssh-1.2.2-org/cipher.h	Thu Nov 25 01:54:58 1999
+++ openssh-1.2.2/cipher.h	Mon Feb 14 17:17:16 2000
@@ -16,7 +16,7 @@
 #ifndef CIPHER_H
 #define CIPHER_H
 
-#include "config.h"
+#include <config.h>
 
 #ifdef HAVE_OPENSSL
 #include <openssl/des.h>
diff -u openssh-1.2.2-org/configure openssh-1.2.2/configure
diff -u openssh-1.2.2-org/fake-getaddrinfo.h openssh-1.2.2/fake-getaddrinfo.h
--- openssh-1.2.2-org/fake-getaddrinfo.h	Sun Jan 16 08:19:25 2000
+++ openssh-1.2.2/fake-getaddrinfo.h	Mon Feb 14 17:17:16 2000
@@ -1,7 +1,7 @@
 #ifndef _FAKE_GETADDRINFO_H
 #define _FAKE_GETADDRINFO_H
 
-#include "config.h"
+#include <config.h>
 
 #include "fake-gai-errnos.h"
 
diff -u openssh-1.2.2-org/fake-getnameinfo.h openssh-1.2.2/fake-getnameinfo.h
--- openssh-1.2.2-org/fake-getnameinfo.h	Fri Jan 14 05:45:49 2000
+++ openssh-1.2.2/fake-getnameinfo.h	Mon Feb 14 17:17:16 2000
@@ -1,7 +1,7 @@
 #ifndef _FAKE_GETNAMEINFO_H
 #define _FAKE_GETNAMEINFO_H
 
-#include "config.h"
+#include <config.h>
 #ifndef HAVE_GETNAMEINFO
 int getnameinfo(const struct sockaddr *sa, size_t salen, char *host, 
                 size_t hostlen, char *serv, size_t servlen, int flags);
diff -u openssh-1.2.2-org/fake-socket.h openssh-1.2.2/fake-socket.h
--- openssh-1.2.2-org/fake-socket.h	Fri Jan 14 05:45:49 2000
+++ openssh-1.2.2/fake-socket.h	Mon Feb 14 17:17:16 2000
@@ -1,7 +1,7 @@
 #ifndef _FAKE_SOCKET_H
 #define _FAKE_SOCKET_H
 
-#include "config.h"
+#include <config.h>
 #include "sys/types.h"
 
 #ifndef HAVE_STRUCT_SOCKADDR_STORAGE
diff -u openssh-1.2.2-org/includes.h openssh-1.2.2/includes.h
--- openssh-1.2.2-org/includes.h	Wed Jan 19 03:45:07 2000
+++ openssh-1.2.2/includes.h	Mon Feb 14 15:00:06 2000
@@ -19,7 +19,7 @@
 #define RCSID(msg) \
 static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 
-#include "config.h"
+#include <config.h>
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff -u openssh-1.2.2-org/md5crypt.c openssh-1.2.2/md5crypt.c
--- openssh-1.2.2-org/md5crypt.c	Tue Dec 28 05:09:36 1999
+++ openssh-1.2.2/md5crypt.c	Mon Feb 14 17:17:39 2000
@@ -15,7 +15,7 @@
  * Adapted from shadow-19990607 by Tudor Bosman, tudorb@jm.nu
  */
 
-#include "config.h"
+#include <config.h>
 
 #if defined(HAVE_MD5_PASSWORDS) && !defined(HAVE_MD5_CRYPT)
 
diff -u openssh-1.2.2-org/md5crypt.h openssh-1.2.2/md5crypt.h
--- openssh-1.2.2-org/md5crypt.h	Tue Dec 28 05:09:36 1999
+++ openssh-1.2.2/md5crypt.h	Mon Feb 14 17:17:16 2000
@@ -18,7 +18,7 @@
 #ifndef _MD5CRYPT_H
 #define _MD5CRYPT_H
 
-#include "config.h"
+#include <config.h>
 
 #if defined(HAVE_MD5_PASSWORDS) && !defined(HAVE_MD5_CRYPT)
 
Common subdirectories: openssh-1.2.2-org/packages and openssh-1.2.2/packages
diff -u openssh-1.2.2-org/packet.h openssh-1.2.2/packet.h
--- openssh-1.2.2-org/packet.h	Fri Jan 14 05:45:51 2000
+++ openssh-1.2.2/packet.h	Mon Feb 14 17:17:16 2000
@@ -18,7 +18,7 @@
 #ifndef PACKET_H
 #define PACKET_H
 
-#include "config.h"
+#include <config.h>
 
 #ifdef HAVE_OPENSSL
 #include <openssl/bn.h>
diff -u openssh-1.2.2-org/rsa.h openssh-1.2.2/rsa.h
--- openssh-1.2.2-org/rsa.h	Thu Nov 25 01:54:59 1999
+++ openssh-1.2.2/rsa.h	Mon Feb 14 17:17:17 2000
@@ -18,7 +18,7 @@
 #ifndef RSA_H
 #define RSA_H
 
-#include "config.h"
+#include <config.h>
 
 #ifdef HAVE_OPENSSL
 #include <openssl/bn.h>
