diff --git a/README.rst b/README.rst
index 521ead9..63f5f69 100644
--- a/README.rst
+++ b/README.rst
@@ -61,7 +61,7 @@ Note: gopsutil v2 breaks compatibility. If you want to stay with compatibility,
    import (
        "fmt"
 
-       "github.com/marcospedreiro/gopsutil/mem"
+       "github.com/shirou/gopsutil/mem"
    )
 
    func main() {
diff --git a/cpu/cpu.go b/cpu/cpu.go
index 9b989ec..ceaf77f 100644
--- a/cpu/cpu.go
+++ b/cpu/cpu.go
@@ -10,7 +10,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 // TimesStat contains the amounts of time the CPU has spent performing different
diff --git a/cpu/cpu_darwin_nocgo.go b/cpu/cpu_darwin_nocgo.go
index 5a77940..242b4a8 100644
--- a/cpu/cpu_darwin_nocgo.go
+++ b/cpu/cpu_darwin_nocgo.go
@@ -3,7 +3,7 @@
 
 package cpu
 
-import "github.com/marcospedreiro/gopsutil/internal/common"
+import "github.com/shirou/gopsutil/internal/common"
 
 func perCPUTimes() ([]TimesStat, error) {
 	return []TimesStat{}, common.ErrNotImplementedError
diff --git a/cpu/cpu_fallback.go b/cpu/cpu_fallback.go
index fde93d6..e9e7ada 100644
--- a/cpu/cpu_fallback.go
+++ b/cpu/cpu_fallback.go
@@ -5,7 +5,7 @@ package cpu
 import (
 	"context"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 func Times(percpu bool) ([]TimesStat, error) {
diff --git a/cpu/cpu_freebsd.go b/cpu/cpu_freebsd.go
index 4c6bd37..b6c7186 100644
--- a/cpu/cpu_freebsd.go
+++ b/cpu/cpu_freebsd.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"unsafe"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 	"golang.org/x/sys/unix"
 )
 
diff --git a/cpu/cpu_freebsd_test.go b/cpu/cpu_freebsd_test.go
index e2574ce..c0ec73c 100644
--- a/cpu/cpu_freebsd_test.go
+++ b/cpu/cpu_freebsd_test.go
@@ -5,7 +5,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 func TestParseDmesgBoot(t *testing.T) {
diff --git a/cpu/cpu_linux.go b/cpu/cpu_linux.go
index 31a3d55..2fffe85 100644
--- a/cpu/cpu_linux.go
+++ b/cpu/cpu_linux.go
@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 var CPUTick = float64(100)
diff --git a/cpu/cpu_openbsd.go b/cpu/cpu_openbsd.go
index 1c358a6..82b920f 100644
--- a/cpu/cpu_openbsd.go
+++ b/cpu/cpu_openbsd.go
@@ -11,7 +11,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 	"golang.org/x/sys/unix"
 )
 
diff --git a/cpu/cpu_solaris.go b/cpu/cpu_solaris.go
index 4b62565..117fd90 100644
--- a/cpu/cpu_solaris.go
+++ b/cpu/cpu_solaris.go
@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 var ClocksPerSec = float64(128)
diff --git a/cpu/cpu_windows.go b/cpu/cpu_windows.go
index 9ea3ac0..3959212 100644
--- a/cpu/cpu_windows.go
+++ b/cpu/cpu_windows.go
@@ -8,7 +8,7 @@ import (
 	"unsafe"
 
 	"github.com/StackExchange/wmi"
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 	"golang.org/x/sys/windows"
 )
 
diff --git a/disk/disk.go b/disk/disk.go
index 95f4645..38d8a8f 100644
--- a/disk/disk.go
+++ b/disk/disk.go
@@ -3,7 +3,7 @@ package disk
 import (
 	"encoding/json"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 var invoke common.Invoker = common.Invoke{}
diff --git a/disk/disk_darwin.go b/disk/disk_darwin.go
index 0369eb9..2b1d000 100644
--- a/disk/disk_darwin.go
+++ b/disk/disk_darwin.go
@@ -7,7 +7,7 @@ import (
 	"path"
 	"unsafe"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 	"golang.org/x/sys/unix"
 )
 
diff --git a/disk/disk_darwin_cgo.go b/disk/disk_darwin_cgo.go
index 7ab3376..480e237 100644
--- a/disk/disk_darwin_cgo.go
+++ b/disk/disk_darwin_cgo.go
@@ -31,7 +31,7 @@ import (
 	"strings"
 	"unsafe"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 func IOCounters(names ...string) (map[string]IOCountersStat, error) {
diff --git a/disk/disk_darwin_nocgo.go b/disk/disk_darwin_nocgo.go
index efc30df..fe76d83 100644
--- a/disk/disk_darwin_nocgo.go
+++ b/disk/disk_darwin_nocgo.go
@@ -6,7 +6,7 @@ package disk
 import (
 	"context"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 func IOCounters(names ...string) (map[string]IOCountersStat, error) {
diff --git a/disk/disk_fallback.go b/disk/disk_fallback.go
index eebd62c..22eb507 100644
--- a/disk/disk_fallback.go
+++ b/disk/disk_fallback.go
@@ -5,7 +5,7 @@ package disk
 import (
 	"context"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 func IOCounters(names ...string) (map[string]IOCountersStat, error) {
diff --git a/disk/disk_freebsd.go b/disk/disk_freebsd.go
index 1f898f3..2e0966a 100644
--- a/disk/disk_freebsd.go
+++ b/disk/disk_freebsd.go
@@ -12,7 +12,7 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 func Partitions(all bool) ([]PartitionStat, error) {
diff --git a/disk/disk_linux.go b/disk/disk_linux.go
index e7121b3..1b10a38 100644
--- a/disk/disk_linux.go
+++ b/disk/disk_linux.go
@@ -14,7 +14,7 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 const (
diff --git a/disk/disk_openbsd.go b/disk/disk_openbsd.go
index c4d647d..6fdf386 100644
--- a/disk/disk_openbsd.go
+++ b/disk/disk_openbsd.go
@@ -9,7 +9,7 @@ import (
 	"path"
 	"unsafe"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 	"golang.org/x/sys/unix"
 )
 
diff --git a/disk/disk_solaris.go b/disk/disk_solaris.go
index 4b645ca..c660835 100644
--- a/disk/disk_solaris.go
+++ b/disk/disk_solaris.go
@@ -10,7 +10,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 	"golang.org/x/sys/unix"
 )
 
diff --git a/disk/disk_unix.go b/disk/disk_unix.go
index e841902..9b499b5 100644
--- a/disk/disk_unix.go
+++ b/disk/disk_unix.go
@@ -51,7 +51,7 @@ func UsageWithContext(ctx context.Context, path string) (*UsageStat, error) {
 		ret.UsedPercent = 0
 	} else {
 		// We don't use ret.Total to calculate percent.
-		// see https://github.com/marcospedreiro/gopsutil/issues/562
+		// see https://github.com/shirou/gopsutil/issues/562
 		ret.UsedPercent = (float64(ret.Used) / float64(ret.Used+ret.Free)) * 100.0
 	}
 
diff --git a/disk/disk_windows.go b/disk/disk_windows.go
index 0e57fe6..326bc1f 100644
--- a/disk/disk_windows.go
+++ b/disk/disk_windows.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"unsafe"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 	"golang.org/x/sys/windows"
 )
 
diff --git a/docker/docker.go b/docker/docker.go
index d551b15..912f933 100644
--- a/docker/docker.go
+++ b/docker/docker.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"errors"
 
-	"github.com/marcospedreiro/gopsutil/cpu"
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/cpu"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 var ErrDockerNotAvailable = errors.New("docker not available")
diff --git a/docker/docker_linux.go b/docker/docker_linux.go
index fad3707..3f5a361 100644
--- a/docker/docker_linux.go
+++ b/docker/docker_linux.go
@@ -11,8 +11,8 @@ import (
 	"strconv"
 	"strings"
 
-	cpu "github.com/marcospedreiro/gopsutil/cpu"
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	cpu "github.com/shirou/gopsutil/cpu"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 // GetDockerStat returns a list of Docker basic stats.
diff --git a/docker/docker_notlinux.go b/docker/docker_notlinux.go
index 0d4fddf..dde104c 100644
--- a/docker/docker_notlinux.go
+++ b/docker/docker_notlinux.go
@@ -5,8 +5,8 @@ package docker
 import (
 	"context"
 
-	cpu "github.com/marcospedreiro/gopsutil/cpu"
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	cpu "github.com/shirou/gopsutil/cpu"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 // GetDockerStat returns a list of Docker basic stats.
diff --git a/host/host.go b/host/host.go
index 94d7fa8..1e9e9bb 100644
--- a/host/host.go
+++ b/host/host.go
@@ -3,7 +3,7 @@ package host
 import (
 	"encoding/json"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 var invoke common.Invoker = common.Invoke{}
diff --git a/host/host_darwin.go b/host/host_darwin.go
index 206965e..8241fc0 100644
--- a/host/host_darwin.go
+++ b/host/host_darwin.go
@@ -16,8 +16,8 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
-	"github.com/marcospedreiro/gopsutil/process"
+	"github.com/shirou/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/process"
 )
 
 // from utmpx.h
diff --git a/host/host_fallback.go b/host/host_fallback.go
index 072bbca..e80d7ea 100644
--- a/host/host_fallback.go
+++ b/host/host_fallback.go
@@ -5,7 +5,7 @@ package host
 import (
 	"context"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 func Info() (*InfoStat, error) {
diff --git a/host/host_freebsd.go b/host/host_freebsd.go
index 1e34b98..00a8519 100644
--- a/host/host_freebsd.go
+++ b/host/host_freebsd.go
@@ -15,8 +15,8 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
-	"github.com/marcospedreiro/gopsutil/process"
+	"github.com/shirou/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/process"
 	"golang.org/x/sys/unix"
 )
 
diff --git a/host/host_linux.go b/host/host_linux.go
index 0c60216..2c1ac6b 100644
--- a/host/host_linux.go
+++ b/host/host_linux.go
@@ -18,7 +18,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 type LSB struct {
diff --git a/host/host_openbsd.go b/host/host_openbsd.go
index 89568d4..2ad64d7 100644
--- a/host/host_openbsd.go
+++ b/host/host_openbsd.go
@@ -15,8 +15,8 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
-	"github.com/marcospedreiro/gopsutil/process"
+	"github.com/shirou/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/process"
 )
 
 const (
diff --git a/host/host_solaris.go b/host/host_solaris.go
index 5e366a0..bb83bfc 100644
--- a/host/host_solaris.go
+++ b/host/host_solaris.go
@@ -14,7 +14,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 func Info() (*InfoStat, error) {
diff --git a/host/host_windows.go b/host/host_windows.go
index f0ec5a0..d89e191 100644
--- a/host/host_windows.go
+++ b/host/host_windows.go
@@ -15,8 +15,8 @@ import (
 	"unsafe"
 
 	"github.com/StackExchange/wmi"
-	"github.com/marcospedreiro/gopsutil/internal/common"
-	process "github.com/marcospedreiro/gopsutil/process"
+	"github.com/shirou/gopsutil/internal/common"
+	process "github.com/shirou/gopsutil/process"
 	"golang.org/x/sys/windows"
 )
 
@@ -102,7 +102,7 @@ func InfoWithContext(ctx context.Context) (*InfoStat, error) {
 }
 
 func getMachineGuid() (string, error) {
-	// there has been reports of issues on 32bit using golang.org/x/sys/windows/registry, see https://github.com/marcospedreiro/gopsutil/pull/312#issuecomment-277422612
+	// there has been reports of issues on 32bit using golang.org/x/sys/windows/registry, see https://github.com/shirou/gopsutil/pull/312#issuecomment-277422612
 	// for rationale of using windows.RegOpenKeyEx/RegQueryValueEx instead of registry.OpenKey/GetStringValue
 	var h windows.Handle
 	err := windows.RegOpenKeyEx(windows.HKEY_LOCAL_MACHINE, windows.StringToUTF16Ptr(`SOFTWARE\Microsoft\Cryptography`), 0, windows.KEY_READ|windows.KEY_WOW64_64KEY, &h)
diff --git a/load/load.go b/load/load.go
index 49e2b4b..9085889 100644
--- a/load/load.go
+++ b/load/load.go
@@ -3,7 +3,7 @@ package load
 import (
 	"encoding/json"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 var invoke common.Invoker = common.Invoke{}
diff --git a/load/load_darwin.go b/load/load_darwin.go
index b4d377b..cd7b74d 100644
--- a/load/load_darwin.go
+++ b/load/load_darwin.go
@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 func Avg() (*AvgStat, error) {
diff --git a/load/load_fallback.go b/load/load_fallback.go
index cd4f182..1e3ade0 100644
--- a/load/load_fallback.go
+++ b/load/load_fallback.go
@@ -5,7 +5,7 @@ package load
 import (
 	"context"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 func Avg() (*AvgStat, error) {
diff --git a/load/load_linux.go b/load/load_linux.go
index f8cf3d5..63c26a2 100644
--- a/load/load_linux.go
+++ b/load/load_linux.go
@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 func Avg() (*AvgStat, error) {
diff --git a/load/load_windows.go b/load/load_windows.go
index 32e4e21..42968b3 100644
--- a/load/load_windows.go
+++ b/load/load_windows.go
@@ -5,7 +5,7 @@ package load
 import (
 	"context"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 func Avg() (*AvgStat, error) {
diff --git a/mem/mem.go b/mem/mem.go
index cfaa56a..e505662 100644
--- a/mem/mem.go
+++ b/mem/mem.go
@@ -3,7 +3,7 @@ package mem
 import (
 	"encoding/json"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 var invoke common.Invoker = common.Invoke{}
diff --git a/mem/mem_darwin.go b/mem/mem_darwin.go
index 3c1f3bb..4fe7009 100644
--- a/mem/mem_darwin.go
+++ b/mem/mem_darwin.go
@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 	"golang.org/x/sys/unix"
 )
 
diff --git a/mem/mem_fallback.go b/mem/mem_fallback.go
index 4bda295..2a0fd45 100644
--- a/mem/mem_fallback.go
+++ b/mem/mem_fallback.go
@@ -5,7 +5,7 @@ package mem
 import (
 	"context"
 
-	"github.com/marcospedreiro/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 fbef03e..fcc9a3f 100644
--- a/mem/mem_linux.go
+++ b/mem/mem_linux.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 	"golang.org/x/sys/unix"
 )
 
diff --git a/mem/mem_openbsd.go b/mem/mem_openbsd.go
index aac01ea..35472a3 100644
--- a/mem/mem_openbsd.go
+++ b/mem/mem_openbsd.go
@@ -10,7 +10,7 @@ import (
 	"fmt"
 	"os/exec"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 func GetPageSize() (uint64, error) {
diff --git a/mem/mem_solaris.go b/mem/mem_solaris.go
index 714f52c..0736bc4 100644
--- a/mem/mem_solaris.go
+++ b/mem/mem_solaris.go
@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 // VirtualMemory for Solaris is a minimal implementation which only returns
diff --git a/mem/mem_windows.go b/mem/mem_windows.go
index 21170f0..cfdf8bd 100644
--- a/mem/mem_windows.go
+++ b/mem/mem_windows.go
@@ -6,7 +6,7 @@ import (
 	"context"
 	"unsafe"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 	"golang.org/x/sys/windows"
 )
 
diff --git a/net/net.go b/net/net.go
index 8e7abc1..fce86c7 100644
--- a/net/net.go
+++ b/net/net.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 var invoke common.Invoker = common.Invoke{}
diff --git a/net/net_fallback.go b/net/net_fallback.go
index af9f572..7c5e632 100644
--- a/net/net_fallback.go
+++ b/net/net_fallback.go
@@ -5,7 +5,7 @@ package net
 import (
 	"context"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 func IOCounters(pernic bool) ([]IOCountersStat, error) {
diff --git a/net/net_freebsd.go b/net/net_freebsd.go
index a0627d5..ce02415 100644
--- a/net/net_freebsd.go
+++ b/net/net_freebsd.go
@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 func IOCounters(pernic bool) ([]IOCountersStat, error) {
diff --git a/net/net_linux.go b/net/net_linux.go
index 6311270..616c10a 100644
--- a/net/net_linux.go
+++ b/net/net_linux.go
@@ -15,7 +15,7 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 // NetIOCounters returnes network I/O statistics for every network
@@ -661,7 +661,7 @@ func processInet(file string, kind netConnectionKindType, inodes map[string][]in
 	// Read the contents of the /proc file with a single read sys call.
 	// This minimizes duplicates in the returned connections
 	// For more info:
-	// https://github.com/marcospedreiro/gopsutil/pull/361
+	// https://github.com/shirou/gopsutil/pull/361
 	contents, err := ioutil.ReadFile(file)
 	if err != nil {
 		return nil, err
@@ -722,7 +722,7 @@ func processUnix(file string, kind netConnectionKindType, inodes map[string][]in
 	// Read the contents of the /proc file with a single read sys call.
 	// This minimizes duplicates in the returned connections
 	// For more info:
-	// https://github.com/marcospedreiro/gopsutil/pull/361
+	// https://github.com/shirou/gopsutil/pull/361
 	contents, err := ioutil.ReadFile(file)
 	if err != nil {
 		return nil, err
diff --git a/net/net_linux_test.go b/net/net_linux_test.go
index 088aaa1..566a17b 100644
--- a/net/net_linux_test.go
+++ b/net/net_linux_test.go
@@ -8,7 +8,7 @@ import (
 	"syscall"
 	"testing"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/net/net_openbsd.go b/net/net_openbsd.go
index c4cc257..3e74e8f 100644
--- a/net/net_openbsd.go
+++ b/net/net_openbsd.go
@@ -12,7 +12,7 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 var portMatch = regexp.MustCompile(`(.*)\.(\d+)$`)
diff --git a/net/net_test.go b/net/net_test.go
index 3d69fff..80f56af 100644
--- a/net/net_test.go
+++ b/net/net_test.go
@@ -6,7 +6,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 )
 
 func TestAddrString(t *testing.T) {
diff --git a/net/net_unix.go b/net/net_unix.go
index 7df3fdd..4451b54 100644
--- a/net/net_unix.go
+++ b/net/net_unix.go
@@ -6,7 +6,7 @@ import (
 	"context"
 	"strings"
 
-	"github.com/marcospedreiro/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 220833b..61eb6ec 100644
--- a/net/net_windows.go
+++ b/net/net_windows.go
@@ -11,7 +11,7 @@ import (
 	"syscall"
 	"unsafe"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 	"golang.org/x/sys/windows"
 )
 
diff --git a/process/process.go b/process/process.go
index 101890a..a4b24f4 100644
--- a/process/process.go
+++ b/process/process.go
@@ -7,9 +7,9 @@ import (
 	"runtime"
 	"time"
 
-	"github.com/marcospedreiro/gopsutil/cpu"
-	"github.com/marcospedreiro/gopsutil/internal/common"
-	"github.com/marcospedreiro/gopsutil/mem"
+	"github.com/shirou/gopsutil/cpu"
+	"github.com/shirou/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/mem"
 )
 
 var (
diff --git a/process/process_darwin.go b/process/process_darwin.go
index 594af3c..509ab3b 100644
--- a/process/process_darwin.go
+++ b/process/process_darwin.go
@@ -13,9 +13,9 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/marcospedreiro/gopsutil/cpu"
-	"github.com/marcospedreiro/gopsutil/internal/common"
-	"github.com/marcospedreiro/gopsutil/net"
+	"github.com/shirou/gopsutil/cpu"
+	"github.com/shirou/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/net"
 	"golang.org/x/sys/unix"
 )
 
diff --git a/process/process_fallback.go b/process/process_fallback.go
index c4ac06c..ca8b72f 100644
--- a/process/process_fallback.go
+++ b/process/process_fallback.go
@@ -6,9 +6,9 @@ import (
 	"context"
 	"syscall"
 
-	"github.com/marcospedreiro/gopsutil/cpu"
-	"github.com/marcospedreiro/gopsutil/internal/common"
-	"github.com/marcospedreiro/gopsutil/net"
+	"github.com/shirou/gopsutil/cpu"
+	"github.com/shirou/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/net"
 )
 
 type MemoryMapsStat struct {
diff --git a/process/process_freebsd.go b/process/process_freebsd.go
index 5952588..af2b3b1 100644
--- a/process/process_freebsd.go
+++ b/process/process_freebsd.go
@@ -8,9 +8,9 @@ import (
 	"encoding/binary"
 	"strings"
 
-	cpu "github.com/marcospedreiro/gopsutil/cpu"
-	"github.com/marcospedreiro/gopsutil/internal/common"
-	net "github.com/marcospedreiro/gopsutil/net"
+	cpu "github.com/shirou/gopsutil/cpu"
+	"github.com/shirou/gopsutil/internal/common"
+	net "github.com/shirou/gopsutil/net"
 	"golang.org/x/sys/unix"
 )
 
diff --git a/process/process_linux.go b/process/process_linux.go
index d33ff0c..f844101 100644
--- a/process/process_linux.go
+++ b/process/process_linux.go
@@ -15,10 +15,10 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/marcospedreiro/gopsutil/cpu"
-	"github.com/marcospedreiro/gopsutil/host"
-	"github.com/marcospedreiro/gopsutil/internal/common"
-	"github.com/marcospedreiro/gopsutil/net"
+	"github.com/shirou/gopsutil/cpu"
+	"github.com/shirou/gopsutil/host"
+	"github.com/shirou/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/net"
 	"golang.org/x/sys/unix"
 )
 
diff --git a/process/process_openbsd.go b/process/process_openbsd.go
index 1ce2c99..b7b2cba 100644
--- a/process/process_openbsd.go
+++ b/process/process_openbsd.go
@@ -10,10 +10,10 @@ import (
 	"strings"
 	"unsafe"
 
-	cpu "github.com/marcospedreiro/gopsutil/cpu"
-	"github.com/marcospedreiro/gopsutil/internal/common"
-	mem "github.com/marcospedreiro/gopsutil/mem"
-	net "github.com/marcospedreiro/gopsutil/net"
+	cpu "github.com/shirou/gopsutil/cpu"
+	"github.com/shirou/gopsutil/internal/common"
+	mem "github.com/shirou/gopsutil/mem"
+	net "github.com/shirou/gopsutil/net"
 	"golang.org/x/sys/unix"
 )
 
diff --git a/process/process_test.go b/process/process_test.go
index 0f3c4ac..a95efc2 100644
--- a/process/process_test.go
+++ b/process/process_test.go
@@ -12,7 +12,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/marcospedreiro/gopsutil/internal/common"
+	"github.com/shirou/gopsutil/internal/common"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/process/process_windows.go b/process/process_windows.go
index 9443808..82aed37 100644
--- a/process/process_windows.go
+++ b/process/process_windows.go
@@ -12,9 +12,9 @@ import (
 	"unsafe"
 
 	"github.com/StackExchange/wmi"
-	cpu "github.com/marcospedreiro/gopsutil/cpu"
-	"github.com/marcospedreiro/gopsutil/internal/common"
-	net "github.com/marcospedreiro/gopsutil/net"
+	cpu "github.com/shirou/gopsutil/cpu"
+	"github.com/shirou/gopsutil/internal/common"
+	net "github.com/shirou/gopsutil/net"
 	"github.com/shirou/w32"
 	"golang.org/x/sys/windows"
 )