diff --git a/CHANGES b/CHANGES
index c2bb3af08..f9f1ddc51 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,7 @@ Bugfixes
 --------
 * Fix MacOS Build error (no SOCK_CLOEXEC on mac) @ensc fixes oetiker#1261
 * Fix build on 32bits platforms (like armhf) when time_t is 64bits, fixes #1264
+* Fix compilation on illumos @hadfl
 
 Features
 --------
diff --git a/src/rrd_config_bottom.h b/src/rrd_config_bottom.h
index 82d04e09a..94091400d 100644
--- a/src/rrd_config_bottom.h
+++ b/src/rrd_config_bottom.h
@@ -27,6 +27,12 @@
 #ifdef HAVE_SYS_PARAM_H
 # include <sys/param.h>
 #endif
+
+/* illumos defines *_MAX macros in limits.h */
+#ifdef __illumos__
+# include <limits.h>
+#endif
+
 #ifndef MAXPATH
 # ifdef PATH_MAX
 #  define MAXPATH PATH_MAX