diff --git a/ChangeLog b/ChangeLog
index 94052a5ed..48002a7b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@
      [auth-options.c]
      ignore permitopen="host:port" if AllowTcpForwarding==no
  - (djm) Make scp work on systems without 64-bit ints
+ - tim@mindrot.org 2001/03/18 18:28:39 [defines.h]
+   move HAVE_LONG_LONG_INT where it works
 
 20010318
  - (bal) Fixed scp type casing issue which causes "scp: protocol error: 
@@ -4606,4 +4608,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.975 2001/03/19 01:45:02 djm Exp $
+$Id: ChangeLog,v 1.976 2001/03/19 02:27:26 tim Exp $
diff --git a/defines.h b/defines.h
index 608965121..9d58db38d 100644
--- a/defines.h
+++ b/defines.h
@@ -1,7 +1,7 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
 
-/* $Id: defines.h,v 1.58 2001/03/19 01:56:14 djm Exp $ */
+/* $Id: defines.h,v 1.59 2001/03/19 02:27:26 tim Exp $ */
 
 /* Some platforms need this for the _r() functions */
 #if !defined(_REENTRANT) && !defined(SNI)
@@ -125,9 +125,6 @@ enum
 /* If sys/types.h does not supply intXX_t, supply them ourselves */
 /* (or die trying) */
 
-#ifdef SIZEOF_LONG_LONG_INT
-# define HAVE_LONG_LONG_INT
-#endif
 
 #ifndef HAVE_U_INT
 typedef unsigned int u_int;
@@ -202,6 +199,7 @@ typedef long int int64_t;
 #  if (SIZEOF_LONG_LONG_INT == 8)
 typedef long long int int64_t;
 #   define HAVE_INT64_T 1
+#   define HAVE_LONG_LONG_INT
 #  endif
 # endif
 #endif