diff --git a/reactos/ChangeLog b/reactos/ChangeLog
index 54117970c9f..577d5da65e2 100644
--- a/reactos/ChangeLog
+++ b/reactos/ChangeLog
@@ -1,3 +1,7 @@
+2003-06-07  Casper S. Hornstrup  <chorns@users.sourceforge.net>
+
+	* ntoskrnl/cm/regfile.c (CmiCopyKey): Fix unsigned/signed warning.
+
 2003-06-05  Casper S. Hornstrup  <chorns@users.sourceforge.net>
 
 	* lib/user32/windows/icon.c (CURSORICON_FindBestCursor,
diff --git a/reactos/ntoskrnl/cm/regfile.c b/reactos/ntoskrnl/cm/regfile.c
index 076a4336a55..de13e5db02a 100644
--- a/reactos/ntoskrnl/cm/regfile.c
+++ b/reactos/ntoskrnl/cm/regfile.c
@@ -3840,7 +3840,7 @@ CmiCopyKey (PREGISTRY_HIVE DstHive,
       DstHive->HiveHeader->RootKeyCell = NewKeyCellOffset;
 
       /* Copy class name */
-      if (SrcKeyCell->ClassNameOffset != -1)
+      if (SrcKeyCell->ClassNameOffset != (BLOCK_OFFSET) -1)
 	{
 	  PDATA_CELL SrcClassNameCell;
 	  PDATA_CELL NewClassNameCell;
@@ -3940,7 +3940,7 @@ CHECKPOINT1;
 			 NewValueCellSize);
 
 	  /* Copy value data cell */
-	  if (SrcValueCell->DataSize > sizeof(PVOID))
+	  if (SrcValueCell->DataSize > (LONG) sizeof(PVOID))
 	    {
 	      SrcValueDataCell = CmiGetBlock (SrcHive, SrcValueCell->DataOffset, NULL);
 
@@ -4005,7 +4005,7 @@ CHECKPOINT1;
 			 NewSubKeyCellSize);
 
 	  /* Copy class name */
-	  if (SrcSubKeyCell->ClassNameOffset != -1)
+	  if (SrcSubKeyCell->ClassNameOffset != (BLOCK_OFFSET) -1)
 	    {
 	      PDATA_CELL SrcClassNameCell;
 	      PDATA_CELL NewClassNameCell;