diff --git a/generator/Makefile b/generator/Makefile
index 72ad84d3..dad41da2 100644
--- a/generator/Makefile
+++ b/generator/Makefile
@@ -63,7 +63,8 @@ READYDATAOS_URL   := https://www.downloads.netgear.com/files/GDC/RD5200/READYDAT
 SOPHOS_XG_URL     := https://docs.sophos.com/nsg/sophos-firewall/MIB/SOPHOS-XG-MIB.zip
 POWERCOM_URL      := https://www.upspowercom.com/pcm-img/Card-DA807/Upsmate_PCM.mib
 TPLINK_DDM        := https://static.tp-link.com/upload/software/2024/202402/20240229/L2-tplinkMibs.zip
-
+CISCO_CUCS_URL    := https://raw.githubusercontent.com/cisco/cisco-mibs/refs/heads/main/ucs-mibs
+CISCO_CUCS_URL_v2 := https://raw.githubusercontent.com/cisco/cisco-mibs/refs/heads/main/v2
 CYBERPOWER_VERSION := 2.11
 CYBERPOWER_URL     := https://dl4jz3rbrsfum.cloudfront.net/software/CyberPower_MIB_v$(CYBERPOWER_VERSION).MIB.zip
 
@@ -159,7 +160,8 @@ mibs: \
   $(MIBDIR)/CyberPower.MIB \
   $(MIBDIR)/EAP.MIB \
   $(MIBDIR)/EAP-Client.MIB \
-  $(MIBDIR)/powercom
+  $(MIBDIR)/powercom \
+  $(MIBDIR)/.cisco_imc
 
 $(MIBDIR)/apc-powernet-mib:
 	@echo ">> Downloading apc-powernet-mib" 
@@ -412,3 +414,12 @@ $(MIBDIR)/readydataos:
 $(MIBDIR)/powercom:
 	@echo ">> Downloading powercom"
 	@curl $(CURL_OPTS) -o $(MIBDIR)/powercom "$(POWERCOM_URL)"
+
+$(MIBDIR)/.cisco_imc:
+	@echo ">> Downloading Cisco UCS to $(TMP)"
+	@curl $(CURL_OPTS) -o $(MIBDIR)/CISCO-UNIFIED-COMPUTING-FAULT-MIB.my "$(CISCO_CUCS_URL)/CISCO-UNIFIED-COMPUTING-FAULT-MIB.my"
+	@curl $(CURL_OPTS) -o $(MIBDIR)/CISCO-UNIFIED-COMPUTING-MIB.my "$(CISCO_CUCS_URL)/CISCO-UNIFIED-COMPUTING-MIB.my"
+	@curl $(CURL_OPTS) -o $(MIBDIR)/CISCO-UNIFIED-COMPUTING-STORAGE-MIB.my "$(CISCO_CUCS_URL)/CISCO-UNIFIED-COMPUTING-STORAGE-MIB.my"
+	@curl $(CURL_OPTS) -o $(MIBDIR)/CISCO-UNIFIED-COMPUTING-TC-MIB.my "$(CISCO_CUCS_URL)/CISCO-UNIFIED-COMPUTING-TC-MIB.my"
+	@curl $(CURL_OPTS) -o $(MIBDIR)/CISCO-TC.my "$(CISCO_CUCS_URL_v2)/CISCO-TC.my"
+	@curl $(CURL_OPTS) -o $(MIBDIR)/CISCO-SMI.my "$(CISCO_CUCS_URL_v2)/CISCO-SMI.my"
\ No newline at end of file
diff --git a/generator/generator.yml b/generator/generator.yml
index 5864318b..4743f4a7 100644
--- a/generator/generator.yml
+++ b/generator/generator.yml
@@ -837,7 +837,6 @@ modules:
       - 1.3.6.1.4.1.935.1.1.1.9.2.2   # upsEnvUnderTemperature
       - 1.3.6.1.4.1.935.1.1.1.9.2.3   # upsEnvOverHumidity
       - 1.3.6.1.4.1.935.1.1.1.9.2.4   # upsEnvUnderHumidity
-
   # tplink ddm information for sfps
   # 
   # Downloads can be found here:
@@ -905,3 +904,8 @@ modules:
           '':
             - regex: '^(\d+\.\d+).*'
               value: '$1'
+  cisco_imc:
+    walk:
+    - 1.3.6.1.4.1.9.9.719.1.45.1.1.6  #cucsStorageControllerOperState
+    - 1.3.6.1.4.1.9.9.719.1.1.1.1.11  #cucsFaultDescription
+    - 1.3.6.1.4.1.9.9.719.1.1.1.1.20  #cucsFaultSeverity
diff --git a/snmp.yml b/snmp.yml
index 6a006d5f..b2cb470f 100644
--- a/snmp.yml
+++ b/snmp.yml
@@ -2928,6 +2928,73 @@ modules:
           0: unknown
           1: ipv4
           2: ipv6
+  cisco_imc:
+    walk:
+    - 1.3.6.1.4.1.9.9.719.1.1.1.1.11
+    - 1.3.6.1.4.1.9.9.719.1.1.1.1.20
+    - 1.3.6.1.4.1.9.9.719.1.45.1.1.6
+    metrics:
+    - name: cucsFaultDescription
+      oid: 1.3.6.1.4.1.9.9.719.1.1.1.1.11
+      type: DisplayString
+      help: Cisco UCS fault:Inst:descr managed object property - 1.3.6.1.4.1.9.9.719.1.1.1.1.11
+      indexes:
+      - labelname: cucsFaultIndex
+        type: gauge
+    - name: cucsFaultSeverity
+      oid: 1.3.6.1.4.1.9.9.719.1.1.1.1.20
+      type: gauge
+      help: Cisco UCS fault:Inst:severity managed object property - 1.3.6.1.4.1.9.9.719.1.1.1.1.20
+      indexes:
+      - labelname: cucsFaultIndex
+        type: gauge
+      enum_values:
+        0: cleared
+        1: info
+        3: warning
+        4: minor
+        5: major
+        6: critical
+    - name: cucsStorageControllerOperState
+      oid: 1.3.6.1.4.1.9.9.719.1.45.1.1.6
+      type: gauge
+      help: Cisco UCS storage:Controller:operState managed object property - 1.3.6.1.4.1.9.9.719.1.45.1.1.6
+      indexes:
+      - labelname: cucsStorageControllerInstanceId
+        type: gauge
+      enum_values:
+        0: unknown
+        1: operable
+        2: inoperable
+        3: degraded
+        4: poweredOff
+        5: powerProblem
+        6: removed
+        7: voltageProblem
+        8: thermalProblem
+        9: performanceProblem
+        10: accessibilityProblem
+        11: identityUnestablishable
+        12: biosPostTimeout
+        13: disabled
+        14: malformedFru
+        15: backplanePortProblem
+        16: chassisIntrusion
+        51: fabricConnProblem
+        52: fabricUnsupportedConn
+        81: config
+        82: equipmentProblem
+        83: decomissioning
+        84: chassisLimitExceeded
+        100: notSupported
+        101: discovery
+        102: discoveryFailed
+        103: identify
+        104: postFailure
+        105: upgradeProblem
+        106: peerCommProblem
+        107: autoUpgrade
+        108: linkActivateBlocked
   cisco_wlc:
     walk:
     - 1.3.6.1.4.1.14179.2.1.1.1.2