diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index 6ff3c963c..00489140a 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-06  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* include/_mingw.h (__int16): Define as short.
+	Thanks to: Leo Yuriev  <leoyuriev at users dot sf dot net>
+
 2005-01-06  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* include/stdio.h (P_tmpdir): Add define.
diff --git a/winsup/mingw/include/_mingw.h b/winsup/mingw/include/_mingw.h
index 97e1d71a0..e9ee1ec88 100644
--- a/winsup/mingw/include/_mingw.h
+++ b/winsup/mingw/include/_mingw.h
@@ -91,7 +91,7 @@
 #  define __int32 long
 # endif
 # ifndef __int16
-#  define __int16 int
+#  define __int16 short
 # endif
 # ifndef __int8
 #  define __int8 char