diff --git a/reactos/ChangeLog b/reactos/ChangeLog
index 87582b575bf..5ee99c74274 100644
--- a/reactos/ChangeLog
+++ b/reactos/ChangeLog
@@ -1,3 +1,11 @@
+2003-04-17  Casper S. Hornstrup  <chorns@users.sourceforge.net>
+
+	* tools/mkhive/infcache.c (InfpCacheFindSection, InfpCacheFindKeyLine,
+	InfFindFirstLine, InfFindFirstMatchLine, InfFindNextMatchLine,
+	InfGetLineCount): Change call to stricmp() to strcasecmp().
+	* tools/mkhive/reginf.c (GetRootKey): Ditto.
+	* tools/mkhive/registry.c (RegSetValue, RegQueryValue): Ditto.
+
 2003-04-13  Casper S. Hornstrup  <chorns@users.sourceforge.net>
 
 	* ntoskrnl/kd/gdbstub.c (KdEnterDebuggerException): Fix signed/unsigned
diff --git a/reactos/tools/mkhive/infcache.c b/reactos/tools/mkhive/infcache.c
index e83e137310c..564292232e8 100644
--- a/reactos/tools/mkhive/infcache.c
+++ b/reactos/tools/mkhive/infcache.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: infcache.c,v 1.2 2003/04/16 15:06:33 ekohl Exp $
+/* $Id: infcache.c,v 1.3 2003/04/17 10:41:02 chorns Exp $
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS hive maker
  * FILE:            tools/mkhive/infcache.c
@@ -29,6 +29,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 
 #include "mkhive.h"
 #include "infcache.h"
@@ -222,7 +223,7 @@ InfpCacheFindSection (PINFCACHE Cache,
   Section = Cache->FirstSection;
   while (Section != NULL)
     {
-      if (stricmp (Section->Name, Name) == 0)
+      if (strcasecmp (Section->Name, Name) == 0)
 	{
 	  return Section;
 	}
@@ -378,7 +379,7 @@ InfpCacheFindKeyLine (PINFCACHESECTION Section,
   Line = Section->FirstLine;
   while (Line != NULL)
     {
-      if (Line->Key != NULL && stricmp (Line->Key, Key) == 0)
+      if (Line->Key != NULL && strcasecmp (Line->Key, Key) == 0)
 	{
 	  return Line;
 	}
@@ -998,7 +999,7 @@ InfFindFirstLine (HINF InfHandle,
       DPRINT("Comparing '%s' and '%s'\n", CacheSection->Name, Section);
 
       /* Are the section names the same? */
-      if (stricmp(CacheSection->Name, Section) == 0)
+      if (strcasecmp(CacheSection->Name, Section) == 0)
 	{
 	  if (Key != NULL)
 	    {
@@ -1072,7 +1073,7 @@ InfFindFirstMatchLine (PINFCONTEXT ContextIn,
   CacheLine = ((PINFCACHESECTION)(ContextIn->Section))->FirstLine;
   while (CacheLine != NULL)
     {
-      if (CacheLine->Key != NULL && stricmp (CacheLine->Key, Key) == 0)
+      if (CacheLine->Key != NULL && strcasecmp (CacheLine->Key, Key) == 0)
 	{
 
 	  if (ContextIn != ContextOut)
@@ -1108,7 +1109,7 @@ InfFindNextMatchLine (PINFCONTEXT ContextIn,
   CacheLine = (PINFCACHELINE)ContextIn->Line;
   while (CacheLine != NULL)
     {
-      if (CacheLine->Key != NULL && stricmp (CacheLine->Key, Key) == 0)
+      if (CacheLine->Key != NULL && strcasecmp (CacheLine->Key, Key) == 0)
 	{
 
 	  if (ContextIn != ContextOut)
@@ -1150,7 +1151,7 @@ InfGetLineCount(HINF InfHandle,
       DPRINT("Comparing '%s' and '%s'\n", CacheSection->Name, Section);
 
       /* Are the section names the same? */
-      if (stricmp(CacheSection->Name, Section) == 0)
+      if (strcasecmp(CacheSection->Name, Section) == 0)
 	{
 	  return CacheSection->LineCount;
 	}
diff --git a/reactos/tools/mkhive/reginf.c b/reactos/tools/mkhive/reginf.c
index ee1fbd42ea8..6c7e6c2fc60 100644
--- a/reactos/tools/mkhive/reginf.c
+++ b/reactos/tools/mkhive/reginf.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: reginf.c,v 1.1 2003/04/14 17:18:48 ekohl Exp $
+/* $Id: reginf.c,v 1.2 2003/04/17 10:41:02 chorns Exp $
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS hive maker
  * FILE:            tools/mkhive/reginf.h
@@ -55,32 +55,32 @@
 static BOOL
 GetRootKey (PCHAR Name)
 {
-  if (!stricmp (Name, "HKCR"))
+  if (!strcasecmp (Name, "HKCR"))
     {
       strcpy (Name, "\\Registry\\Machine\\SOFTWARE\\Classes\\");
       return TRUE;
     }
 
-  if (!stricmp (Name, "HKCU"))
+  if (!strcasecmp (Name, "HKCU"))
     {
       strcpy (Name, "\\Registry\\User\\.DEFAULT\\");
       return TRUE;
     }
 
-  if (!stricmp (Name, "HKLM"))
+  if (!strcasecmp (Name, "HKLM"))
     {
       strcpy (Name, "\\Registry\\Machine\\");
       return TRUE;
     }
 
-  if (!stricmp (Name, "HKU"))
+  if (!strcasecmp (Name, "HKU"))
     {
       strcpy (Name, "\\Registry\\User\\");
       return TRUE;
     }
 
 #if 0
-  if (!stricmp (Name, "HKR"))
+  if (!strcasecmp (Name, "HKR"))
     return FALSE;
 #endif
 
diff --git a/reactos/tools/mkhive/registry.c b/reactos/tools/mkhive/registry.c
index b656b751cf4..115969f3d3b 100644
--- a/reactos/tools/mkhive/registry.c
+++ b/reactos/tools/mkhive/registry.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: registry.c,v 1.2 2003/04/16 15:06:33 ekohl Exp $
+/* $Id: registry.c,v 1.3 2003/04/17 10:41:02 chorns Exp $
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS hive maker
  * FILE:            tools/mkhive/registry.c
@@ -432,7 +432,7 @@ RegSetValue(HKEY Key,
 
 	  DPRINT ("Value->Name '%s'\n", Value->Name);
 
-	  if (stricmp(Value->Name, ValueName) == 0)
+	  if (strcasecmp(Value->Name, ValueName) == 0)
 	    break;
 
 	  Ptr = Ptr->Flink;
@@ -535,7 +535,7 @@ RegQueryValue(HKEY Key,
 
 	  DPRINT("Searching for '%s'. Value name '%s'\n", ValueName, Value->Name);
 
-	  if (stricmp(Value->Name, ValueName) == 0)
+	  if (strcasecmp(Value->Name, ValueName) == 0)
 	    break;
 
 	  Ptr = Ptr->Flink;