diff --git a/src/ChangeLog b/src/ChangeLog
index ccf844164..5d09f14ae 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,9 @@
 	* tty.h: Moved the function printwstr to slint.c, because the
 	SunPro compiler does not eliminate unused inline functions.
 	* slint.c: printwstr has been moved to here.
+	* unixcompat.h: Only include <sys/sysmacros.h> if we're on AIX,
+	as Solaris defines the macros twice---once in <sys/mkdev.h>,
+	and once in <sys/sysmacros.h>.
 
 2005-02-23  Roland Illig  <roland.illig@gmx.de>
 
diff --git a/src/unixcompat.h b/src/unixcompat.h
index a21713bc5..b4d030569 100644
--- a/src/unixcompat.h
+++ b/src/unixcompat.h
@@ -14,7 +14,7 @@
 #ifdef HAVE_SYS_MKDEV_H
 # include <sys/mkdev.h>		/* Solaris 9 */
 #endif
-#ifdef HAVE_SYS_SYSMACROS_H
+#if defined(_AIX) && defined(HAVE_SYS_SYSMACROS_H)
 # include <sys/sysmacros.h>	/* AIX */
 #endif