diff --git a/WINGs/ChangeLog b/WINGs/ChangeLog
index b1a3d45f..d6ef10c8 100644
--- a/WINGs/ChangeLog
+++ b/WINGs/ChangeLog
@@ -7,6 +7,7 @@ changes since wmaker 0.63.1:
   use #include <WINGs/header_file_name> in your application from now on.
   Also updated get-{wings|wutil}-flags.
 - Fixed a mem leak in WMList.
+- Fixed a bug that caused sigsegv for a WMList with more than 32767 items.
 
 
 changes since wmaker 0.62.1:
diff --git a/WINGs/wlist.c b/WINGs/wlist.c
index df196dcc..56af1867 100644
--- a/WINGs/wlist.c
+++ b/WINGs/wlist.c
@@ -16,7 +16,7 @@ typedef struct W_List {
 
     short itemHeight;
 
-    short topItem;	    /* index of first visible item */
+    int topItem;	    /* index of first visible item */
 
     short fullFitLines;	    /* no of lines that fit entirely */