diff --git a/ChangeLog b/ChangeLog
index f4d5d46c..bd7a356b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-10  Akim Demaille  <akim@epita.fr>
+
+	* src/system.h: Rely on HAVE_LIMITS_H.
+	Suggested by Paul Eggert.
+
 2002-04-09  Akim Demaille  <akim@epita.fr>
 
 	* tests/calc.at (_AT_CHECK_CALC_ERROR): Receive as argument the
diff --git a/src/system.h b/src/system.h
index 45427449..6dd83bcf 100644
--- a/src/system.h
+++ b/src/system.h
@@ -89,8 +89,15 @@ char *alloca ();
 # endif
 #endif
 
-/* FIXME: Autoconfiscate. */
-#include <limits.h>
+#if HAVE_LIMITS_H
+# include <limits.h>
+#endif
+#ifndef SHRT_MIN
+# define SHRT_MIN (-32768)
+#endif
+#ifndef SHRT_MAX
+# define SHRT_MAX 32767
+#endif
 
 # include "xalloc.h"