diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml
index 96e0a6db93..ae7351b96c 100644
--- a/.builds/freebsd.yml
+++ b/.builds/freebsd.yml
@@ -10,7 +10,7 @@ environment:
     CC: clang
     HOST_CC: clang
 sources:
-    - https://github.com/radare/radare2
+    - https://github.com/radareorg/radare2
 tasks:
     - build: |
         cd radare2
diff --git a/.builds/openbsd.yml b/.builds/openbsd.yml
index 9e090ad450..25de2a2117 100644
--- a/.builds/openbsd.yml
+++ b/.builds/openbsd.yml
@@ -8,7 +8,7 @@ environment:
     CXX: clang++
     CC: clang
 sources:
-    - https://github.com/radare/radare2
+    - https://github.com/radareorg/radare2
 tasks:
     - build: |
         cd radare2
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 03d1180a06..000d73f2a5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -21,7 +21,7 @@ try to keep the codebase consistent and clean.
 * Fork the repository on GitHub.
 * Create a topic branch from master. Please avoid working directly on the ```master``` branch.
 * Make commits of logical units.
-* Check for coding style issues with ```git diff master..mybranch | ./sys/clang-format-diff.py -p1``` and be sure to follow the CODINGSTYLE (more on this in [DEVELOPERS.md](https://github.com/radare/radare2/blob/master/DEVELOPERS.md)).
+* Check for coding style issues with ```git diff master..mybranch | ./sys/clang-format-diff.py -p1``` and be sure to follow the CODINGSTYLE (more on this in [DEVELOPERS.md](https://github.com/radareorg/radare2/blob/master/DEVELOPERS.md)).
 * Submit the Pull Request(PR) on Github.
 * When relevant, write a test for
   [radare2-regressions](https://github.com/radareorg/radare2-regressions) and
@@ -32,5 +32,5 @@ try to keep the codebase consistent and clean.
 
 # Additional resources
 
-* [README.md](https://github.com/radare/radare2/blob/master/README.md)
-* [DEVELOPERS.md](https://github.com/radare/radare2/blob/master/DEVELOPERS.md)
+* [README.md](https://github.com/radareorg/radare2/blob/master/README.md)
+* [DEVELOPERS.md](https://github.com/radareorg/radare2/blob/master/DEVELOPERS.md)
diff --git a/Vagrantfile.sh b/Vagrantfile.sh
index b2efe042a2..f346b8877c 100644
--- a/Vagrantfile.sh
+++ b/Vagrantfile.sh
@@ -3,5 +3,5 @@
 # Updates
 sudo pacman -Syu
 
-git clone --depth=1 https://github.com/radare/radare2
+git clone --depth=1 https://github.com/radareorg/radare2
 cd radare2 && ./sys/install.sh
diff --git a/doc/esil.md b/doc/esil.md
index d3c5559163..e210f18eea 100644
--- a/doc/esil.md
+++ b/doc/esil.md
@@ -1,8 +1,6 @@
 ESIL
 ====
 
-# source https://github.com/radare/radare2/wiki/ESIL
-
 ESIL stands for 'Evaluable Strings Intermediate Language'. It aims to describe a
 Forth-like representation for every opcode. Those representations can be
 evaluated in order to emulate code. Each element of an esil expression is
diff --git a/doc/freebsd.md b/doc/freebsd.md
index 4cbc1bb20e..86f63e5c89 100644
--- a/doc/freebsd.md
+++ b/doc/freebsd.md
@@ -13,7 +13,7 @@ Radare2 Dependencies:
 
 	sudo pkg install git gcc gmake patch pkgconf
 
-	git clone https://github.com/radare/radare2
+	git clone https://github.com/radareorg/radare2
 	cd radare2
 	sys/install.sh /usr/local
 
diff --git a/doc/openbsd.md b/doc/openbsd.md
index f15d8d3a80..ba760c06a4 100644
--- a/doc/openbsd.md
+++ b/doc/openbsd.md
@@ -13,7 +13,7 @@ Radare2 Dependencies:
 
 	doas pkg_add git gcc gmake pkgconf
 
-	git clone https://github.com/radare/radare2
+	git clone https://github.com/radareorg/radare2
 	cd radare2
 	sys/install.sh /usr/local
 
diff --git a/doc/repo b/doc/repo
index dd6fecb40a..d3beab54ae 100755
--- a/doc/repo
+++ b/doc/repo
@@ -1,9 +1,9 @@
 #!/bin/sh
-R2=https://github.com/radare/radare2
+R2=https://github.com/radareorg/radare2
 IRED=https://github.com/radare/ired
-EXTRAS=https://github.com/radare/radare2-extras
+EXTRAS=https://github.com/radareorg/radare2-extras
 CAPSTONE=https://github.com/radare/radare2-capstone
-BINDINGS=https://github.com/radare/radare2-bindings
+BINDINGS=https://github.com/radareorg/radare2-bindings
 REGRESSIONS=https://github.com/radareorg/radare2-regressions
 PR_REGRESSIONS=https://github.com/__USER__/radare2-regressions
 [ -z "$1" ] && grep -h $0 | grep -v grep || eval echo \$$1
diff --git a/libr/anal/p/anal_mips_gnu.c b/libr/anal/p/anal_mips_gnu.c
index 9dfc0ada95..df328a0073 100644
--- a/libr/anal/p/anal_mips_gnu.c
+++ b/libr/anal/p/anal_mips_gnu.c
@@ -275,7 +275,7 @@ static int mips_op(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *b, int len, R
 		// but the macro needs the opcode values as input
 		//
 		// TODO: this is a stop-gap. Really we need some smarts in here to tie this into the
-		// flags directly, as suggested here: https://github.com/radare/radare2/issues/949#issuecomment-43654922
+		// flags directly, as suggested here: https://github.com/radareorg/radare2/issues/949#issuecomment-43654922
 		case 15: // lui
 			op->dst = r_anal_value_new ();
 			op->dst->reg = r_reg_get (anal->reg, mips_reg_decode(rt), R_REG_TYPE_GPR);