diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9aa17ea46be..9fad99b266d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-08  Jonathan Gray <jsg@openbsd.org>
+
+	* config/openbsd-stdint.h: Change to reflect what
+	c_common_nodes_and_builtins expects.
+
 2009-11-08  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* builtins.c (apply_args_reg_offset): Remove commented out delaration.
diff --git a/gcc/config/openbsd-stdint.h b/gcc/config/openbsd-stdint.h
index de36455393c..ab1f9cfffc6 100644
--- a/gcc/config/openbsd-stdint.h
+++ b/gcc/config/openbsd-stdint.h
@@ -5,18 +5,18 @@
 #define INT32_TYPE		"int"
 #define INT64_TYPE		"long long int"
 #define UINT8_TYPE		"unsigned char"
-#define UINT16_TYPE		"unsigned short int"
+#define UINT16_TYPE		"short unsigned int"
 #define UINT32_TYPE		"unsigned int"
-#define UINT64_TYPE		"unsigned long long int"
+#define UINT64_TYPE		"long long unsigned int"
  
 #define INT_LEAST8_TYPE		"signed char"
 #define INT_LEAST16_TYPE	"short int"
 #define INT_LEAST32_TYPE	"int"
 #define INT_LEAST64_TYPE	"long long int"
 #define UINT_LEAST8_TYPE	"unsigned char"
-#define UINT_LEAST16_TYPE	"unsigned short int"
+#define UINT_LEAST16_TYPE	"short unsigned int"
 #define UINT_LEAST32_TYPE	"unsigned int"
-#define UINT_LEAST64_TYPE	"unsigned long long int"
+#define UINT_LEAST64_TYPE	"long long unsigned int"
  
 #define INT_FAST8_TYPE		"int"
 #define INT_FAST16_TYPE		"int"
@@ -25,7 +25,7 @@
 #define UINT_FAST8_TYPE		"unsigned int"
 #define UINT_FAST16_TYPE	"unsigned int"
 #define UINT_FAST32_TYPE	"unsigned int"
-#define UINT_FAST64_TYPE	"unsigned long long int"
+#define UINT_FAST64_TYPE	"long long unsigned int"
  
 #define INTPTR_TYPE		"long int"
-#define UINTPTR_TYPE		"unsigned long int"
+#define UINTPTR_TYPE		"long unsigned int"