diff --git a/html/images/logos/proxmox.svg b/html/images/logos/proxmox.svg
new file mode 100644
index 0000000000..0c3971a791
--- /dev/null
+++ b/html/images/logos/proxmox.svg
@@ -0,0 +1 @@
+
diff --git a/html/images/os/proxmox.svg b/html/images/os/proxmox.svg
new file mode 100644
index 0000000000..41de5f9849
--- /dev/null
+++ b/html/images/os/proxmox.svg
@@ -0,0 +1 @@
+
diff --git a/includes/definitions/proxmox.yaml b/includes/definitions/proxmox.yaml
new file mode 100644
index 0000000000..de03ab1456
--- /dev/null
+++ b/includes/definitions/proxmox.yaml
@@ -0,0 +1,28 @@
+os: proxmox
+type: server
+group: unix
+text: proxmox pve
+icon: proxmox
+ifXmcbc: 1
+ifname: 1
+over:
+ - { graph: device_processor, text: 'Processor Usage' }
+ - { graph: device_ucd_memory, text: 'Memory Usage' }
+ - { graph: device_storage, text: 'Storage Usage' }
+poller_modules:
+ bgp-peers: 0
+ ospf: 0
+ stp: 0
+discovery_modules:
+ applications: 1
+ bgp-peers: 0
+ stp: 0
+ vmware-vminfo: 0
+ libvirt-vminfo: 0
+processor_stacked: 1
+discovery:
+ -
+ sysObjectId:
+ - .1.3.6.1.4.1.8072.3.2.10
+ sysDescr_regex:
+ - '/ PVE /'
diff --git a/includes/polling/os/unix.inc.php b/includes/polling/os/unix.inc.php
index fc475bd0fc..507db07444 100644
--- a/includes/polling/os/unix.inc.php
+++ b/includes/polling/os/unix.inc.php
@@ -1,6 +1,6 @@