diff --git a/go.mod b/go.mod
index 5cd7656..c75099e 100644
--- a/go.mod
+++ b/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/mattn/go-runewidth v0.0.2 // indirect
 	github.com/nsf/termbox-go v0.0.0-20180407224525-3e24a7b6661e // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/shirou/gopsutil v0.0.0-20180811135056-68ff0e299699
+	github.com/shirou/gopsutil v2.18.11+incompatible
 	github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 // indirect
 	github.com/stretchr/testify v1.2.2 // indirect
 	golang.org/x/sys v0.0.0-20180406135729-3b87a42e500a // indirect
diff --git a/go.sum b/go.sum
index 136220c..3e01526 100644
--- a/go.sum
+++ b/go.sum
@@ -22,6 +22,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/shirou/gopsutil v0.0.0-20180811135056-68ff0e299699 h1:AJW3z3AIDXJBKlPs1bhA0pb0rYKyTv+rzHE/spMC72Y=
 github.com/shirou/gopsutil v0.0.0-20180811135056-68ff0e299699/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
+github.com/shirou/gopsutil v2.18.11+incompatible h1:PMFTKnFTr/YTRW5rbLK4vWALV3a+IGXse5nvhSjztmg=
+github.com/shirou/gopsutil v2.18.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 h1:udFKJ0aHUL60LboW/A+DfgoHVedieIzIXE8uylPue0U=
 github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc=
 github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
diff --git a/src/widgets/disk.go b/src/widgets/disk.go
index b231620..c4a5695 100644
--- a/src/widgets/disk.go
+++ b/src/widgets/disk.go
@@ -66,12 +66,9 @@ func (self *Disk) update() {
 			continue
 		}
 		if _, ok := self.Partitions[device]; !ok {
-			// https://github.com/shirou/gopsutil/issues/555
-			// have to remove artifacts produced by gopsutil when there's a space in the mount path
-			mountPoint := strings.Replace(Part.Mountpoint, "\\040", " ", -1)
 			self.Partitions[device] = &Partition{
 				Device: device,
-				Mount:  mountPoint,
+				Mount:  Part.Mountpoint,
 			}
 		}
 	}