diff --git a/src/include/port/solaris.h b/src/include/port/solaris.h
index e671153b34..e13af401e3 100644
--- a/src/include/port/solaris.h
+++ b/src/include/port/solaris.h
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/include/port/solaris.h,v 1.14 2006/10/04 22:49:44 momjian Exp $ */
+/* $PostgreSQL: pgsql/src/include/port/solaris.h,v 1.15 2007/01/10 18:22:50 tgl Exp $ */
 
 /*
  * Sort this out for all operating systems some time.  The __xxx
@@ -9,6 +9,14 @@
 #define __i386__
 #endif
 
+#if defined(__amd64) && !defined(__amd64__)
+#define __amd64__
+#endif
+
+#if defined(__x86_64) && !defined(__x86_64__)
+#define __x86_64__
+#endif
+
 #if defined(__sparc) && !defined(__sparc__)
 #define __sparc__
 #endif
@@ -34,6 +42,9 @@
 #ifdef __i386__
 #define		 BYTE_ORDER		 LITTLE_ENDIAN
 #endif
+#if defined(__amd64___) || defined(__x86_64__)
+#define		 BYTE_ORDER		 LITTLE_ENDIAN
+#endif
 #endif
 
 /*