diff --git a/ChangeLog b/ChangeLog
index 052948ef7..e5de631a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@
  - (djm) Sync with -current openbsd-compat/readpassphrase.c:
    - djm@cvs.openbsd.org 2001/06/27 13:23:30
      typo, spotted by Tom Holroyd <tomh@po.crl.go.jp>; ok deraadt@
+ - (djm) Turn up warnings if gcc or egcs detected
 
 20010625
  - OpenBSD CVS Sync
@@ -5803,4 +5804,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1330 2001/06/27 13:26:38 djm Exp $
+$Id: ChangeLog,v 1.1331 2001/06/27 13:35:51 djm Exp $
diff --git a/configure.in b/configure.in
index 199c1a694..554d1cf40 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.292 2001/06/25 08:09:17 djm Exp $
+# $Id: configure.in,v 1.293 2001/06/27 13:35:53 djm Exp $
 
 AC_INIT(ssh.c)
 
@@ -41,10 +41,9 @@ if test -z "$LD" ; then
 fi
 AC_SUBST(LD)
 	
-# C Compiler features
 AC_C_INLINE
-if test "$GCC" = "yes"; then 
-	CFLAGS="$CFLAGS -Wall"
+if test "$GCC" = "yes" || test "$GCC" = "egcs"; then 
+	CFLAGS="$CFLAGS -Wall -Wpointer-arith -Wno-uninitialized"
 fi
 
 # Check for some target-specific stuff