diff --git a/cpu/cpu_darwin_nocgo.go b/cpu/cpu_darwin_nocgo.go
index 1f2bfd2..0b7d1f9 100644
--- a/cpu/cpu_darwin_nocgo.go
+++ b/cpu/cpu_darwin_nocgo.go
@@ -3,7 +3,7 @@
 
 package cpu
 
-import "github.com/yhat/gopsutil/internal/common"
+import "github.com/shirou/gopsutil/internal/common"
 
 func perCPUTimes() ([]CPUTimesStat, error) {
 	return []CPUTimesStat{}, common.NotImplementedError
diff --git a/cpu/cpu_freebsd.go b/cpu/cpu_freebsd.go
index c03b87f..5df67b3 100644
--- a/cpu/cpu_freebsd.go
+++ b/cpu/cpu_freebsd.go
@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/yhat/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 // sys/resource.h
diff --git a/cpu/cpu_linux.go b/cpu/cpu_linux.go
index 5c56f99..8dbbd85 100644
--- a/cpu/cpu_linux.go
+++ b/cpu/cpu_linux.go
@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/yhat/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 var cpu_tick = float64(100)
diff --git a/cpu/cpu_windows.go b/cpu/cpu_windows.go
index 29a35a9..408d6a6 100644
--- a/cpu/cpu_windows.go
+++ b/cpu/cpu_windows.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/StackExchange/wmi"
 
-	"github.com/yhat/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 type Win32_Processor struct {
diff --git a/disk/disk_darwin.go b/disk/disk_darwin.go
index e51ac56..fbf97c6 100644
--- a/disk/disk_darwin.go
+++ b/disk/disk_darwin.go
@@ -6,7 +6,7 @@ import (
 	"syscall"
 	"unsafe"
 
-	"github.com/yhat/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 func DiskPartitions(all bool) ([]DiskPartitionStat, error) {
diff --git a/disk/disk_freebsd.go b/disk/disk_freebsd.go
index 883e921..7e32c4b 100644
--- a/disk/disk_freebsd.go
+++ b/disk/disk_freebsd.go
@@ -9,7 +9,7 @@ import (
 	"syscall"
 	"unsafe"
 
-	"github.com/yhat/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 const (
diff --git a/disk/disk_linux.go b/disk/disk_linux.go
index a104ffe..caa1e17 100644
--- a/disk/disk_linux.go
+++ b/disk/disk_linux.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/yhat/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 const (
diff --git a/disk/disk_windows.go b/disk/disk_windows.go
index 384d60b..5ebe2db 100644
--- a/disk/disk_windows.go
+++ b/disk/disk_windows.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/StackExchange/wmi"
 
-	"github.com/yhat/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 var (
diff --git a/docker/docker_linux.go b/docker/docker_linux.go
index 308761a..1b6ac9a 100644
--- a/docker/docker_linux.go
+++ b/docker/docker_linux.go
@@ -11,8 +11,8 @@ import (
 	"strconv"
 	"strings"
 
-	cpu "github.com/yhat/gopsutil/cpu"
-	"github.com/yhat/gopsutil/internal/common"
+	cpu "github.com/shirou/gopsutil/cpu"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 // GetDockerIDList returnes a list of DockerID.
diff --git a/docker/docker_notlinux.go b/docker/docker_notlinux.go
index 88ab928..b45f96c 100644
--- a/docker/docker_notlinux.go
+++ b/docker/docker_notlinux.go
@@ -5,8 +5,8 @@ package docker
 import (
 	"encoding/json"
 
-	"github.com/yhat/gopsutil/cpu"
-        "github.com/yhat/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/cpu"
+        "github.com/shirou/gopsutil/internal/common"
 )
 
 // GetDockerIDList returnes a list of DockerID.
diff --git a/host/host_darwin.go b/host/host_darwin.go
index 3fb9a3a..069c6fa 100644
--- a/host/host_darwin.go
+++ b/host/host_darwin.go
@@ -14,7 +14,7 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/yhat/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 func HostInfo() (*HostInfoStat, error) {
diff --git a/host/host_freebsd.go b/host/host_freebsd.go
index 0e7d413..4a151fd 100644
--- a/host/host_freebsd.go
+++ b/host/host_freebsd.go
@@ -14,7 +14,7 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/yhat/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 const (
diff --git a/host/host_linux.go b/host/host_linux.go
index ff669c2..91b1530 100644
--- a/host/host_linux.go
+++ b/host/host_linux.go
@@ -16,7 +16,7 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/yhat/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 type LSB struct {
diff --git a/host/host_windows.go b/host/host_windows.go
index de8f98f..13890bf 100644
--- a/host/host_windows.go
+++ b/host/host_windows.go
@@ -11,8 +11,8 @@ import (
 
 	"github.com/StackExchange/wmi"
 
-	"github.com/yhat/gopsutil/internal/common"
-	process "github.com/yhat/gopsutil/process"
+	"github.com/shirou/gopsutil/internal/common"
+	process "github.com/shirou/gopsutil/process"
 )
 
 var (
diff --git a/load/load_darwin.go b/load/load_darwin.go
index 8c86067..0d1c7ec 100644
--- a/load/load_darwin.go
+++ b/load/load_darwin.go
@@ -5,7 +5,7 @@ package load
 import (
 	"strconv"
 
-	"github.com/yhat/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 func LoadAvg() (*LoadAvgStat, error) {
diff --git a/load/load_freebsd.go b/load/load_freebsd.go
index 4cedfb3..e97c569 100644
--- a/load/load_freebsd.go
+++ b/load/load_freebsd.go
@@ -5,7 +5,7 @@ package load
 import (
 	"strconv"
 
-	"github.com/yhat/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 func LoadAvg() (*LoadAvgStat, error) {
diff --git a/load/load_linux.go b/load/load_linux.go
index fd06370..80621c9 100644
--- a/load/load_linux.go
+++ b/load/load_linux.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/yhat/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 func LoadAvg() (*LoadAvgStat, error) {
diff --git a/load/load_windows.go b/load/load_windows.go
index 6482ea3..65a6ba7 100644
--- a/load/load_windows.go
+++ b/load/load_windows.go
@@ -3,7 +3,7 @@
 package load
 
 import (
-	"github.com/yhat/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 func LoadAvg() (*LoadAvgStat, error) {
diff --git a/mem/mem_darwin.go b/mem/mem_darwin.go
index 6971171..ba4dbd8 100644
--- a/mem/mem_darwin.go
+++ b/mem/mem_darwin.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/yhat/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 func getPageSize() (uint64, error) {
diff --git a/mem/mem_freebsd.go b/mem/mem_freebsd.go
index f9a38db..0cb33ab 100644
--- a/mem/mem_freebsd.go
+++ b/mem/mem_freebsd.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 	"errors"
-	"github.com/yhat/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 func VirtualMemory() (*VirtualMemoryStat, error) {
diff --git a/mem/mem_linux.go b/mem/mem_linux.go
index 9115523..fc92262 100644
--- a/mem/mem_linux.go
+++ b/mem/mem_linux.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/yhat/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 func VirtualMemory() (*VirtualMemoryStat, error) {
diff --git a/mem/mem_windows.go b/mem/mem_windows.go
index ee87a1d..2696da5 100644
--- a/mem/mem_windows.go
+++ b/mem/mem_windows.go
@@ -6,7 +6,7 @@ import (
 	"syscall"
 	"unsafe"
 
-	"github.com/yhat/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 var (
diff --git a/net/net.go b/net/net.go
index cbe6ff5..61f9abf 100644
--- a/net/net.go
+++ b/net/net.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/yhat/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 var invoke common.Invoker
diff --git a/net/net_darwin.go b/net/net_darwin.go
index 8ad13b7..7786f7c 100644
--- a/net/net_darwin.go
+++ b/net/net_darwin.go
@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/yhat/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 // example of netstat -idbn output on yosemite
diff --git a/net/net_freebsd.go b/net/net_freebsd.go
index e51b86d..d6882f1 100644
--- a/net/net_freebsd.go
+++ b/net/net_freebsd.go
@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/yhat/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 func NetIOCounters(pernic bool) ([]NetIOCountersStat, error) {
diff --git a/net/net_linux.go b/net/net_linux.go
index 7db6583..a091ee5 100644
--- a/net/net_linux.go
+++ b/net/net_linux.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/yhat/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 // NetIOCounters returnes network I/O statistics for every network
diff --git a/net/net_unix.go b/net/net_unix.go
index e3f1d9a..fe2f1eb 100644
--- a/net/net_unix.go
+++ b/net/net_unix.go
@@ -5,7 +5,7 @@ package net
 import (
 	"strings"
 
-	"github.com/yhat/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 // Return a list of network connections opened.
diff --git a/net/net_windows.go b/net/net_windows.go
index d2eda67..33aceb6 100644
--- a/net/net_windows.go
+++ b/net/net_windows.go
@@ -9,7 +9,7 @@ import (
 	"syscall"
 	"unsafe"
 
-	"github.com/yhat/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 var (
diff --git a/process/process.go b/process/process.go
index 7dd0797..0526f78 100644
--- a/process/process.go
+++ b/process/process.go
@@ -5,8 +5,8 @@ import (
 	"runtime"
 	"time"
 
-	"github.com/yhat/gopsutil/cpu"
-	"github.com/yhat/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/cpu"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 var invoke common.Invoker
diff --git a/process/process_darwin.go b/process/process_darwin.go
index 4a7a389..01cb66c 100644
--- a/process/process_darwin.go
+++ b/process/process_darwin.go
@@ -10,9 +10,9 @@ import (
 	"syscall"
 	"unsafe"
 
-	"github.com/yhat/gopsutil/cpu"
-	"github.com/yhat/gopsutil/internal/common"
-	"github.com/yhat/gopsutil/net"
+	"github.com/shirou/gopsutil/cpu"
+	"github.com/shirou/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/net"
 )
 
 // copied from sys/sysctl.h
diff --git a/process/process_freebsd.go b/process/process_freebsd.go
index d91b0ab..ecd8920 100644
--- a/process/process_freebsd.go
+++ b/process/process_freebsd.go
@@ -9,9 +9,9 @@ import (
 	"strings"
 	"syscall"
 
-	cpu "github.com/yhat/gopsutil/cpu"
-	"github.com/yhat/gopsutil/internal/common"
-	net "github.com/yhat/gopsutil/net"
+	cpu "github.com/shirou/gopsutil/cpu"
+	"github.com/shirou/gopsutil/internal/common"
+	net "github.com/shirou/gopsutil/net"
 )
 
 // MemoryInfoExStat is different between OSes
diff --git a/process/process_linux.go b/process/process_linux.go
index 6c2d882..f54af9f 100644
--- a/process/process_linux.go
+++ b/process/process_linux.go
@@ -12,10 +12,10 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/yhat/gopsutil/cpu"
-	"github.com/yhat/gopsutil/host"
-	"github.com/yhat/gopsutil/internal/common"
-	"github.com/yhat/gopsutil/net"
+	"github.com/shirou/gopsutil/cpu"
+	"github.com/shirou/gopsutil/host"
+	"github.com/shirou/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/net"
 )
 
 const (
diff --git a/process/process_test.go b/process/process_test.go
index e7e2e15..153302e 100644
--- a/process/process_test.go
+++ b/process/process_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/yhat/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 var mu sync.Mutex
diff --git a/process/process_windows.go b/process/process_windows.go
index 32ede90..d7a4b1c 100644
--- a/process/process_windows.go
+++ b/process/process_windows.go
@@ -10,11 +10,11 @@ import (
 	"unsafe"
 
 	"github.com/StackExchange/wmi"
-	"github.com/yhat/w32"
+	"github.com/shirou/w32"
 
-	"github.com/yhat/gopsutil/internal/common"
-	cpu "github.com/yhat/gopsutil/cpu"
-	net "github.com/yhat/gopsutil/net"
+	"github.com/shirou/gopsutil/internal/common"
+	cpu "github.com/shirou/gopsutil/cpu"
+	net "github.com/shirou/gopsutil/net"
 )
 
 const (