diff --git a/core/lib/rand.c b/core/lib/rand.c
index 54c1681fb..6ac27e2a2 100644
--- a/core/lib/rand.c
+++ b/core/lib/rand.c
@@ -28,11 +28,15 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: rand.c,v 1.5 2007/06/04 18:03:58 bg- Exp $
+ * @(#)$Id: rand.c,v 1.6 2007/06/05 10:02:53 bg- Exp $
  */
 
 #include <stdlib.h>
 
+#if defined(__GNUC__) && defined(__MSP430__)
+#undef RAND_MAX			/* Broken header files! */
+#endif
+
 #include "lib/assert.h"
 
 #ifdef RAND_MAX