diff --git a/build.psm1 b/build.psm1
index 2a109da28e..d5af6b1d35 100644
--- a/build.psm1
+++ b/build.psm1
@@ -145,7 +145,8 @@ function Start-PSBuild {
     }
 
     # handle ResGen
-    if ($ResGen -or -not (Test-Path "$($Options.Top)/gen"))
+    # Heuristic to run ResGen on the fresh machine
+    if ($ResGen -or -not (Test-Path "$PSScriptRoot/src/Microsoft.PowerShell.ConsoleHost/gen"))
     {
         log "Run ResGen (generating C# bindings for resx files)"
         Start-ResGen
diff --git a/src/Microsoft.PowerShell.Commands.Management/map.json b/src/Microsoft.PowerShell.Commands.Management/map.json
index 98ea88c235..7d4e51d0e0 100644
--- a/src/Microsoft.PowerShell.Commands.Management/map.json
+++ b/src/Microsoft.PowerShell.Commands.Management/map.json
@@ -17,6 +17,7 @@
     "monad/src/commands/management/ClearContentCommand.cs":  "commands/management/ClearContentCommand.cs",
     "monad/src/commands/management/resources/ProcessCommandHelpResources.resx":  "resources/ProcessCommandHelpResources.resx",
     "monad/src/commands/management/resources/ComputerResources.resx":  "resources/ComputerResources.resx",
+    "monad/src/commands/management/resources/ComputerInfoResources.resx":  "resources/ComputerInfoResources.resx",
     "monad/src/commands/management/SetClipboardCommand.cs":  "commands/management/SetClipboardCommand.cs",
     "monad/src/commands/management/ResolvePathCommand.cs":  "commands/management/ResolvePathCommand.cs",
     "monad/src/commands/management/resources/ProcessResources.resx":  "resources/ProcessResources.resx",
diff --git a/src/Microsoft.PowerShell.Commands.Management/resources/ComputerInfoResources.resx b/src/Microsoft.PowerShell.Commands.Management/resources/ComputerInfoResources.resx
new file mode 100644
index 0000000000..ebcfddb5bf
--- /dev/null
+++ b/src/Microsoft.PowerShell.Commands.Management/resources/ComputerInfoResources.resx
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="LoadingOperationSystemInfo" xml:space="preserve">
+    <value>Loading operating system information</value>
+  </data>
+  <data name="LoadingHotPatchInfo" xml:space="preserve">
+    <value>Loading hot-patch information</value>
+  </data>
+  <data name="LoadingRegistryInfo" xml:space="preserve">
+    <value>Loading registry information</value>
+  </data>
+  <data name="LoadingBiosInfo" xml:space="preserve">
+    <value>Loading BIOS information</value>
+  </data>
+  <data name="LoadingMotherboardInfo" xml:space="preserve">
+    <value>Loading motherboard information</value>
+  </data>
+  <data name="LoadingComputerInfo" xml:space="preserve">
+    <value>Loading Computer information</value>
+  </data>
+  <data name="LoadingProcessorInfo" xml:space="preserve">
+    <value>Loading processor information</value>
+  </data>
+  <data name="LoadingNetworkAdapterInfo" xml:space="preserve">
+    <value>Loading network adapter information</value>
+  </data>
+</root>
\ No newline at end of file