diff --git a/dlls/commdlg/cdlg_En.rc b/dlls/commdlg/cdlg_En.rc
index ba67341f234..b13fbeeece6 100644
--- a/dlls/commdlg/cdlg_En.rc
+++ b/dlls/commdlg/cdlg_En.rc
@@ -357,7 +357,12 @@ aa aa a2 00 43 02'}
 
 
 
+#if 0
 
+/*
+ * DO NOT ENABLE!
+ * These IDs are out of range.
+ */
 
 /* NOTE: Please, do not translate these texts yet! */
 STRINGTABLE DISCARDABLE
@@ -392,3 +397,5 @@ Please enter a value between %d and %d"
     PRINTER_STATUS_SERVER_UNKNOWN    "Print server unknown"
     PRINTER_STATUS_POWER_SAVE        "Power safe mode"
 }
+
+#endif
diff --git a/tools/wrc/CHANGES b/tools/wrc/CHANGES
index f3bb86f92a2..8ec4804f534 100644
--- a/tools/wrc/CHANGES
+++ b/tools/wrc/CHANGES
@@ -1,3 +1,11 @@
+---------------------------------------------------------------------------
+Version 1.0.15 (13-Aug-1999)
+
+Bertho Stultiens <bertho@akhphd.au.dk>
+- Bugfix: IDs were not checked which resulted in numbers > 2^16-1 being
+  accepted as IDs. This resulted in duplicate IDs and all other sort of
+  trouble.
+
 ---------------------------------------------------------------------------
 Version 1.0.14 (08-Aug-1999)
 
diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y
index 96a50e26a35..e80ec08102d 100644
--- a/tools/wrc/parser.y
+++ b/tools/wrc/parser.y
@@ -433,6 +433,8 @@ resource
  * Get a valid name/id
  */
 nameid	: expr	{
+		if($1 > 65535 || $1 < -32768)
+			yyerror("Resource's ID out of range (%d)", $1);
 		$$ = new_name_id();
 		$$->type = name_ord;
 		$$->name.i_name = $1;
@@ -1305,6 +1307,8 @@ strings	: /* Empty */	{ $$ = NULL; }
 	| strings expr opt_comma tSTRING {
 		int i;
 		assert(tagstt != NULL);
+		if($2 > 65535 || $2 < -32768)
+			yyerror("Stringtable entry's ID out of range (%d)", $2);
 		/* Search for the ID */
 		for(i = 0; i < tagstt->nentries; i++)
 		{
diff --git a/tools/wrc/wrc.h b/tools/wrc/wrc.h
index 0d586e2593e..2577e6a170e 100644
--- a/tools/wrc/wrc.h
+++ b/tools/wrc/wrc.h
@@ -12,8 +12,8 @@
 #include "wrctypes.h"
 #endif
 
-#define WRC_VERSION	"1.0.14"
-#define WRC_RELEASEDATE	"(08-Aug-1999)"
+#define WRC_VERSION	"1.0.15"
+#define WRC_RELEASEDATE	"(13-Aug-1999)"
 #define WRC_FULLVERSION WRC_VERSION " " WRC_RELEASEDATE
 
 /* Only used in heavy debugging sessions */