diff --git a/CHANGES b/CHANGES
index 88640ece..b09675a7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,4 @@
+19 Jun 2002 Set manufacterer to HRC for STSI - Jan Jaeger
 18 Jun 2002 FBA dasdtab updates - Tomas Masek by Greg Smith
 18 Jun 2002 Fix NRF condition for CKD dasd - Greg Smith
 17 Jun 2002 Fix segmentation fault during cckd compress - Greg Smith
diff --git a/control.c b/control.c
index 378f797b..f89b18d6 100644
--- a/control.c
+++ b/control.c
@@ -707,7 +707,7 @@ RADR    abs2;                           /* absolute address of op2   */
     abs2 = LOGICAL_TO_ABS (n2, r2, regs, ACCTYPE_WRITE, regs->psw.pkey);
 
     /* Load second operand from operand address  */
-    n1 = fetch_fw(sysblk.mainstor + abs2);
+    FETCH_FW(n1, sysblk.mainstor + abs2);
 
     /* Compare operand with R1 register contents */
     if ( regs->GR_L(r1) == n1 )
@@ -5373,12 +5373,12 @@ SYSIB222  *sysib222;                    /* LPAR CPUs                 */
 SYSIB322  *sysib322;                    /* VM CPUs                   */
 SYSIBVMDB *sysib322;                    /* VM description block      */
 #endif
-static BYTE manufact[16] = { 0xD1,0xC1,0xD5,0xD1,0xC1,0xC5,0xC7,0xC5,
-                             0xD9,0x40,0x40,0x40,0x40,0x40,0x40,0x40 };
+static BYTE manufact[16] = { 0xC8,0xD9,0xC3,0x40,0x40,0x40,0x40,0x40,
+                             0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40 };
 static BYTE plant[4] = { 0xE9,0xE9,0x40,0x40 };
 static BYTE hexebcdic[16] = { 0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,
                               0xF8,0xF9,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6 };
-static BYTE model[8] = { 0xC8,0xC5,0xD9,0xC3,0xE4,0xD3,0xC5,0xE2 };
+static BYTE model[8] = { 0xC5,0xD4,0xE4,0xD3,0xC1,0xE3,0xD6,0xD9 };
 static BYTE mpfact[32] = { 0x00,0x4B,0x00,0x4B,0x00,0x4B,0x00,0x4B,
                            0x00,0x4B,0x00,0x4B,0x00,0x4B,0x00,0x4B,
                            0x00,0x4B,0x00,0x4B,0x00,0x4B,0x00,0x4B,
diff --git a/feat370.h b/feat370.h
index 3fcb4fb7..a41d89bc 100644
--- a/feat370.h
+++ b/feat370.h
@@ -17,5 +17,7 @@
 #define FEATURE_S370_CHANNEL
 #define FEATURE_CHANNEL_SWITCHING
 
+/* Hercules special */
+#define FEATURE_STORE_SYSTEM_INFORMATION
 #endif /*defined(OPTION_370_MODE)*/
 /* end of FEAT370.H */
diff --git a/opcode.c b/opcode.c
index 82d11794..54ac5fae 100644
--- a/opcode.c
+++ b/opcode.c
@@ -1956,7 +1956,7 @@ zz_func opcode_b2xx[256][GEN_MAXARCH] = {
  /*B27A*/ GENx___x___x___ ,                                     /* Sysplex   */
  /*B27B*/ GENx___x___x___ ,                                     /* TFF/Sysplx*/
  /*B27C*/ GENx___x___x___ ,                                     /* Sysplex   */
- /*B27D*/ GENx___x390x900 (store_system_information,S,"STSI"),
+ /*B27D*/ GENx370x390x900 (store_system_information,S,"STSI"),
  /*B27E*/ GENx___x___x___ ,                                     /* Sysplex   */
  /*B27F*/ GENx___x___x___ ,                                     /* Sysplex   */
  /*B280*/ GENx___x___x___ ,                                     /*#LN L      */