diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3307a6688ac8..ec97f3aae3a3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-09  Mark Kettenis  <kettenis@gnu.org>
+
+	* config/openbsd-stdint.h (INTMAX_TYPE, UINTMAX_TYPE): Define.
+			
 2012-09-09  Jan Hubicka  <jh@suse.cz>
 
 	* passes.c (ipa_write_summaries_1): Set state;
diff --git a/gcc/config/openbsd-stdint.h b/gcc/config/openbsd-stdint.h
index ab1f9cfffc61..a6da1da191f2 100644
--- a/gcc/config/openbsd-stdint.h
+++ b/gcc/config/openbsd-stdint.h
@@ -26,6 +26,9 @@
 #define UINT_FAST16_TYPE	"unsigned int"
 #define UINT_FAST32_TYPE	"unsigned int"
 #define UINT_FAST64_TYPE	"long long unsigned int"
+
+#define INTMAX_TYPE		"long long int"
+#define UINTMAX_TYPE		"long long unsigned int"
  
 #define INTPTR_TYPE		"long int"
 #define UINTPTR_TYPE		"long unsigned int"