diff --git a/plugins/inputs/ipmi/README.md b/plugins/inputs/ipmi/README.md
index 499c4d6b2..ca42f7d10 100644
--- a/plugins/inputs/ipmi/README.md
+++ b/plugins/inputs/ipmi/README.md
@@ -12,7 +12,7 @@ ipmitool -I lan -H 192.168.1.1 -U USERID -P PASSW0RD sdr
 
 - ipmi_sensor:
 
-    * Tags: `host`,`inst`
+    * Tags: `server`,`host`
     * Fields:
       - status
       - value
diff --git a/plugins/inputs/ipmi/ipmi.go b/plugins/inputs/ipmi/ipmi.go
index 03cd0c210..8a34c8d3f 100644
--- a/plugins/inputs/ipmi/ipmi.go
+++ b/plugins/inputs/ipmi/ipmi.go
@@ -65,7 +65,7 @@ func (m *Ipmi) gatherServer(serv string, acc telegraf.Accumulator) error {
 	for i := 0; i < len(lines); i++ {
 		vals := strings.Split(lines[i], "|")
 		if len(vals) == 3 {
-			tags := map[string]string{"host": conn.Hostname, "inst": trim(vals[0])}
+			tags := map[string]string{"server": conn.Hostname, "name": trim(vals[0])}
 			fields := make(map[string]interface{})
 			if strings.EqualFold("ok", trim(vals[2])) {
 				fields["status"] = 1