diff --git a/ChangeLog b/ChangeLog
index 6793fc25d..ec7e6cdde 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
 ChangeLog information for FRRouting is for now recorded in source-code
 management system. Please see:
 
-	http://www.freerangerouting.org/
+	http://www.frrouting.org/
diff --git a/REPORTING-BUGS b/REPORTING-BUGS
index a37f5c282..01f25a205 100644
--- a/REPORTING-BUGS
+++ b/REPORTING-BUGS
@@ -10,7 +10,7 @@ non-response to requests to reconfirm or supply additional
 information.
 
 Report bugs on Github Issue Tracker at 
-    https://github.com/freerangerouting/frr/issues
+    https://github.com/frrouting/frr/issues
 
 Please supply the following information:
 1. Your FRRouting version or if it is from git then the  commit reference.
diff --git a/configure.ac b/configure.ac
index cbddaa63f..02f1ae239 100755
--- a/configure.ac
+++ b/configure.ac
@@ -7,8 +7,8 @@
 ##
 AC_PREREQ(2.60)
 
-AC_INIT(frr, 2.0-rc2, [https://github.com/freerangerouting/frr/issues])
-PACKAGE_URL="https://freerangerouting.org/"
+AC_INIT(frr, 2.0-rc2, [https://github.com/frrouting/frr/issues])
+PACKAGE_URL="https://frrouting.org/"
 PACKAGE_FULLNAME="FRRouting"
 AC_SUBST(PACKAGE_FULLNAME)
 
diff --git a/debian/README.Debian b/debian/README.Debian
index caded5207..4cf35d7e3 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -14,7 +14,7 @@ available forcing you to explicitly type "apt-get install frr" to upgrade it.
 * What is frr?
 =================
 
-http://www.freerangerouting.org/
+http://www.frrouting.org/
 FRR is a routing software suite, providing implementations of OSPFv2,
 OSPFv3, RIP v1 and v2, RIPng, ISIS, PIM, BGP and LDP for Unix platforms, particularly
 FreeBSD and Linux and also NetBSD, to mention a few. FRR is a fork of Quagga
diff --git a/debian/copyright b/debian/copyright
index 6a5ed98f9..7b873abd3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Frr
-Upstream-Contact: maintainers@freerangerouting.org, security@freerangerouting.org
-Source: http://www.freerangerouting.org/
+Upstream-Contact: maintainers@frrouting.org, security@frrouting.org
+Source: http://www.frrouting.org/
 
 Files: *
 Copyright: 1996-2003 by the original Zebra authors:
diff --git a/doc/Building_FRR_on_CentOS6.md b/doc/Building_FRR_on_CentOS6.md
index 1ff474823..c0c8efafd 100644
--- a/doc/Building_FRR_on_CentOS6.md
+++ b/doc/Building_FRR_on_CentOS6.md
@@ -78,7 +78,7 @@ an example.)
 You may want to pay special attention to `/usr/lib64` paths and change 
 them if you are not building on a x86_64 architecture
 
-    git clone https://github.com/freerangerouting/frr.git frr
+    git clone https://github.com/frrouting/frr.git frr
     cd frr
     git checkout stable/2.0
     ./bootstrap.sh
diff --git a/doc/Building_FRR_on_CentOS7.md b/doc/Building_FRR_on_CentOS7.md
index 1a9bcb881..570d14dee 100644
--- a/doc/Building_FRR_on_CentOS7.md
+++ b/doc/Building_FRR_on_CentOS7.md
@@ -37,7 +37,7 @@ an example.)
 You may want to pay special attention to `/usr/lib64` paths and change 
 them if you are not building on a x86_64 architecture
 
-    git clone https://github.com/freerangerouting/frr.git frr
+    git clone https://github.com/frrouting/frr.git frr
     cd frr
     git checkout stable/2.0
     ./bootstrap.sh
diff --git a/doc/Building_FRR_on_Debian8.md b/doc/Building_FRR_on_Debian8.md
index 4335e7621..81d58827d 100644
--- a/doc/Building_FRR_on_Debian8.md
+++ b/doc/Building_FRR_on_Debian8.md
@@ -39,7 +39,7 @@ any packages**
 (You may prefer different options on configure statement. These are just
 an example.)
 
-    git clone https://github.com/freerangerouting/frr.git frr
+    git clone https://github.com/frrouting/frr.git frr
     cd frr
     git checkout stable/2.0
     ./bootstrap.sh
diff --git a/doc/Building_FRR_on_Fedora24.md b/doc/Building_FRR_on_Fedora24.md
index 0afc5c676..6c5b78b1e 100644
--- a/doc/Building_FRR_on_Fedora24.md
+++ b/doc/Building_FRR_on_Fedora24.md
@@ -30,7 +30,7 @@ an example.)
 You may want to pay special attention to `/usr/lib64` paths and change 
 them if you are not building on a x86_64 architecture
 
-    git clone https://github.com/freerangerouting/frr.git frr
+    git clone https://github.com/frrouting/frr.git frr
     cd frr
     git checkout stable/2.0
     ./bootstrap.sh
diff --git a/doc/Building_FRR_on_FreeBSD10.md b/doc/Building_FRR_on_FreeBSD10.md
index 696b7d5d2..8b5c919b6 100644
--- a/doc/Building_FRR_on_FreeBSD10.md
+++ b/doc/Building_FRR_on_FreeBSD10.md
@@ -41,7 +41,7 @@ using any packages**
 (You may prefer different options on configure statement. These are just 
 an example)
 
-    git clone https://github.com/freerangerouting/frr.git frr
+    git clone https://github.com/frrouting/frr.git frr
     cd frr
     git checkout stable/2.0
     ./bootstrap.sh
diff --git a/doc/Building_FRR_on_FreeBSD11.md b/doc/Building_FRR_on_FreeBSD11.md
index d0b8a7bf8..4c8704c6a 100644
--- a/doc/Building_FRR_on_FreeBSD11.md
+++ b/doc/Building_FRR_on_FreeBSD11.md
@@ -41,7 +41,7 @@ using any packages**
 (You may prefer different options on configure statement. These are just
 an example)
 
-    git clone https://github.com/freerangerouting/frr.git frr
+    git clone https://github.com/frrouting/frr.git frr
     cd frr
     git checkout stable/2.0
     ./bootstrap.sh
diff --git a/doc/Building_FRR_on_FreeBSD9.md b/doc/Building_FRR_on_FreeBSD9.md
index d470d0046..0a866acf9 100644
--- a/doc/Building_FRR_on_FreeBSD9.md
+++ b/doc/Building_FRR_on_FreeBSD9.md
@@ -41,7 +41,7 @@ using any packages**
 (You may prefer different options on configure statement. These are just
 an example)
 
-    git clone https://github.com/freerangerouting/frr.git frr
+    git clone https://github.com/frrouting/frr.git frr
     cd frr
     git checkout stable/2.0
     ./bootstrap.sh
diff --git a/doc/Building_FRR_on_NetBSD6.md b/doc/Building_FRR_on_NetBSD6.md
index 03d04ce95..dfc1f2c29 100644
--- a/doc/Building_FRR_on_NetBSD6.md
+++ b/doc/Building_FRR_on_NetBSD6.md
@@ -45,7 +45,7 @@ Get FRR, compile it and install it (from Git)
 (You may prefer different options on configure statement. These are just 
 an example)
 
-    git clone https://github.com/freerangerouting/frr.git frr
+    git clone https://github.com/frrouting/frr.git frr
     cd frr
     git checkout stable/2.0
     ./bootstrap.sh
diff --git a/doc/Building_FRR_on_NetBSD7.md b/doc/Building_FRR_on_NetBSD7.md
index d9b4b47ea..99230e385 100644
--- a/doc/Building_FRR_on_NetBSD7.md
+++ b/doc/Building_FRR_on_NetBSD7.md
@@ -39,7 +39,7 @@ Get FRR, compile it and install it (from Git)
 (You may prefer different options on configure statement. These are just
 an example)
 
-    git clone https://github.com/freerangerouting/frr.git frr
+    git clone https://github.com/frrouting/frr.git frr
     cd frr
     git checkout stable/2.0
     ./bootstrap.sh
diff --git a/doc/Building_FRR_on_OmniOS.md b/doc/Building_FRR_on_OmniOS.md
index f158c80a7..7ed22aaae 100644
--- a/doc/Building_FRR_on_OmniOS.md
+++ b/doc/Building_FRR_on_OmniOS.md
@@ -87,7 +87,7 @@ any packages**
 (You may prefer different options on configure statement. These are just
 an example)
 
-    git clone https://github.com/freerangerouting/frr.git frr
+    git clone https://github.com/frrouting/frr.git frr
     cd frr
     git checkout stable/2.0
     ./bootstrap.sh
diff --git a/doc/Building_FRR_on_OpenBSD6.md b/doc/Building_FRR_on_OpenBSD6.md
index 9e13d5ce4..40bf982a4 100644
--- a/doc/Building_FRR_on_OpenBSD6.md
+++ b/doc/Building_FRR_on_OpenBSD6.md
@@ -40,7 +40,7 @@ any packages**
 (You may prefer different options on configure statement. These are just 
 an example)
 
-    git clone https://github.com/freerangerouting/frr.git frr
+    git clone https://github.com/frrouting/frr.git frr
     cd frr
     git checkout stable/2.0
     ./bootstrap.sh
diff --git a/doc/Building_FRR_on_Ubuntu1204.md b/doc/Building_FRR_on_Ubuntu1204.md
index 3312a2c9c..6e6374c2f 100644
--- a/doc/Building_FRR_on_Ubuntu1204.md
+++ b/doc/Building_FRR_on_Ubuntu1204.md
@@ -72,7 +72,7 @@ any packages**
 (You may prefer different options on configure statement. These are just
 an example.)
 
-    git clone https://github.com/freerangerouting/frr.git frr
+    git clone https://github.com/frrouting/frr.git frr
     cd frr
     git checkout stable/2.0
     ./bootstrap.sh
diff --git a/doc/Building_FRR_on_Ubuntu1404.md b/doc/Building_FRR_on_Ubuntu1404.md
index ac0a45acd..6db3f426b 100644
--- a/doc/Building_FRR_on_Ubuntu1404.md
+++ b/doc/Building_FRR_on_Ubuntu1404.md
@@ -32,7 +32,7 @@ any packages**
 (You may prefer different options on configure statement. These are just 
 an example.)
 
-    git clone https://github.com/freerangerouting/frr.git frr
+    git clone https://github.com/frrouting/frr.git frr
     cd frr
     git checkout stable/2.0
     ./bootstrap.sh
diff --git a/doc/Building_FRR_on_Ubuntu1604.md b/doc/Building_FRR_on_Ubuntu1604.md
index d1e1a377d..8e71cc1ee 100644
--- a/doc/Building_FRR_on_Ubuntu1604.md
+++ b/doc/Building_FRR_on_Ubuntu1604.md
@@ -33,7 +33,7 @@ any packages**
 (You may prefer different options on configure statement. These are just 
 an example.)
 
-    git clone https://github.com/freerangerouting/frr.git frr
+    git clone https://github.com/frrouting/frr.git frr
     cd frr
     git checkout stable/2.0
     ./bootstrap.sh
diff --git a/doc/frr.texi b/doc/frr.texi
index d4a78b7b8..0478ec592 100644
--- a/doc/frr.texi
+++ b/doc/frr.texi
@@ -7,7 +7,7 @@
 @setfilename frr.info
 @c Set variables - sourced from defines.texi
 @include defines.texi
-@settitle @uref{http://www.freerangerouting.org,,@value{PACKAGE_NAME}}
+@settitle @uref{http://www.frrouting.org,,@value{PACKAGE_NAME}}
 @c %**end of header
 
 @c automake will automatically generate version.texi
@@ -48,16 +48,16 @@ This file documents the Frr Software Routing Suite which manages common
 TCP/IP routing protocols.
 
 This is Edition @value{EDITION}, last updated @value{UPDATED} of
-@cite{The Frr Manual}, for @uref{http://www.freerangerouting.org/,,@value{PACKAGE_NAME}}
+@cite{The Frr Manual}, for @uref{http://www.frrouting.org/,,@value{PACKAGE_NAME}}
 Version @value{VERSION}.
 
 @insertcopying
 @end ifinfo
 
 @titlepage
-@title @uref{http://www.freerangerouting.org,,Frr}
+@title @uref{http://www.frrouting.org,,Frr}
 @subtitle A routing software package for TCP/IP networks
-@subtitle @uref{http://www.freerangerouting.org,,@value{PACKAGE_NAME}} @value{VERSION}
+@subtitle @uref{http://www.frrouting.org,,@value{PACKAGE_NAME}} @value{VERSION}
 @subtitle @value{UPDATED-MONTH}
 @author @value{AUTHORS}
 
@@ -72,9 +72,9 @@ Version @value{VERSION}.
 @node Top
 @top Frr -- With Virtual Network Control
 		     
-@uref{http://www.freerangerouting.org,,Frr} is an advanced routing software package
+@uref{http://www.frrouting.org,,Frr} is an advanced routing software package
 that provides a suite of TCP/IP based routing protocols.  This is the Manual
-for @value{PACKAGE_STRING}. @uref{http://www.freerangerouting.org,,Frr} is a fork of 
+for @value{PACKAGE_STRING}. @uref{http://www.frrouting.org,,Frr} is a fork of 
 @uref{http://www.quagga.net,,Quagga}.
 
 @insertcopying
diff --git a/doc/overview.texi b/doc/overview.texi
index 370ada3f8..7ecf3d95c 100644
--- a/doc/overview.texi
+++ b/doc/overview.texi
@@ -2,7 +2,7 @@
 @chapter Overview
 @cindex Overview
 
-  @uref{http://www.freerangerouting.org,,Frr} is a routing software package that
+  @uref{http://www.frrouting.org,,Frr} is a routing software package that
 provides TCP/IP based routing services with routing protocols support such
 as RIPv1, RIPv2, RIPng, OSPFv2, OSPFv3, IS-IS, BGP-4, and BGP-4+ (@pxref{Supported
 RFCs}). Frr also supports special BGP Route Reflector and Route Server
@@ -275,12 +275,12 @@ November 1995.}
 
 The official Frr web-site is located at:
 
-@uref{http://www.freerangerouting.org/}
+@uref{http://www.frrouting.org/}
 
 and contains further information, as well as links to additional
 resources. 
 
-@uref{http://www.freerangerouting.org/,Frr} is a fork of Quagga, whose
+@uref{http://www.frrouting.org/,Frr} is a fork of Quagga, whose
 web-site is located at:
 
 @uref{http://www.quagga.net/}.
@@ -298,7 +298,7 @@ comments or suggestions to Frr, please subscribe to:
 
 @uref{http://lists.nox.tf/listinfo/frr-users}.
 
-The @uref{http://www.freerangerouting.org/,,Frr} site has further information on
+The @uref{http://www.frrouting.org/,,Frr} site has further information on
 the available mailing lists, see:
 
 	@uref{http://lists.nox.tf/lists.php}
@@ -315,7 +315,7 @@ the available mailing lists, see:
 
 If you think you have found a bug, please send a bug report to:
 
-@uref{http://github.com/freerangerouting/frr/issues}
+@uref{http://github.com/frrouting/frr/issues}
 
 When you send a bug report, please be careful about the points below.
 
@@ -334,4 +334,4 @@ arguments to the configure script please note that too.
 
   Bug reports are very important for us to improve the quality of Frr.
 Frr is still in the development stage, but please don't hesitate to
-send a bug report to @uref{http://github.com/freerangerouting/frr/issues}.
+send a bug report to @uref{http://github.com/frrouting/frr/issues}.
diff --git a/redhat/README.rpm_build.md b/redhat/README.rpm_build.md
index c266f3dc2..6bec5d65c 100644
--- a/redhat/README.rpm_build.md
+++ b/redhat/README.rpm_build.md
@@ -12,7 +12,7 @@ Building your own FRRouting RPM
 	
 2. Checkout FRR under a **unpriviledged** user account
 
-		git clone https://github.com/freerangerouting/frr.git frr
+		git clone https://github.com/frrouting/frr.git frr
 
 3. Run Bootstrap and make distribution tar.gz
 
diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in
index e0d8f697d..6d94b5a5c 100644
--- a/redhat/frr.spec.in
+++ b/redhat/frr.spec.in
@@ -100,8 +100,8 @@ Version:		%{rpmversion}
 Release:		@CONFDATE@%{release_rev}%{?dist}
 License:		GPLv2+
 Group:			System Environment/Daemons
-Source0:		http://www.freerangerouting.org/releases/frr/%{name}-%{frrversion}.tar.gz
-URL:			http://www.freerangerouting.org
+Source0:		http://www.frrouting.org/releases/frr/%{name}-%{frrversion}.tar.gz
+URL:			http://www.frrouting.org
 Requires:		ncurses json-c
 Requires(pre):	/sbin/install-info
 Requires(preun): /sbin/install-info
diff --git a/snapcraft/README.snap_build.md b/snapcraft/README.snap_build.md
index b14b10b83..c4db51bd6 100644
--- a/snapcraft/README.snap_build.md
+++ b/snapcraft/README.snap_build.md
@@ -9,7 +9,7 @@ which uses earlier versions of snaps)
 	
 2. Checkout FRRouting under a **unpriviledged** user account
 
-        git clone https://github.com/freerangerouting/frr.git
+        git clone https://github.com/frrouting/frr.git
         cd frr
 
 3. Run Bootstrap and make distribution tar.gz
diff --git a/snapcraft/README.usage.md b/snapcraft/README.usage.md
index a8d6bca76..aaff59438 100644
--- a/snapcraft/README.usage.md
+++ b/snapcraft/README.usage.md
@@ -65,7 +65,7 @@ Sourcecode available
 The source for this SNAP is available as part of the FRRouting
 Source Code Distribution. 
 
-    https://github.com/freerangerouting/frr.git
+    https://github.com/frrouting/frr.git
 
 Instructions for rebuilding the snap are in `README.snap_build.md`
 
diff --git a/solaris/frr.xml.in b/solaris/frr.xml.in
index 825c987a4..08a9a11c0 100644
--- a/solaris/frr.xml.in
+++ b/solaris/frr.xml.in
@@ -148,8 +148,8 @@
 		<documentation>
 			<manpage title='zebra' section='1M'
 				manpath='@mandir@' />
-			<doc_link name='freerangerouting.org' 
-				uri='http://www.freerangerouting.org/' />
+			<doc_link name='frrouting.org' 
+				uri='http://www.frrouting.org/' />
 		</documentation>
 	</template>
 	</instance>
@@ -279,8 +279,8 @@
 		<documentation>
 			<manpage title='ripd' section='1M'
 				manpath='@mandir@' />
-			<doc_link name='freerangerouting.org' 
-				uri='http://www.freerangerouting.org/' />
+			<doc_link name='frrouting.org' 
+				uri='http://www.frrouting.org/' />
 		</documentation>
 	</template>
 	</instance>
@@ -408,8 +408,8 @@
 		<documentation>
 			<manpage title='ripngd' section='1M'
 				manpath='@mandir@' />
-			<doc_link name='freerangerouting.org' 
-				uri='http://www.freerangerouting.org/' />
+			<doc_link name='frrouting.org' 
+				uri='http://www.frrouting.org/' />
 		</documentation>
 	</template>
 	</instance>
@@ -539,8 +539,8 @@
 		<documentation>
 			<manpage title='ospfd' section='1M'
 				manpath='@mandir@' />
-			<doc_link name='freerangerouting.org' 
-				uri='http://www.freerangerouting.org/' />
+			<doc_link name='frrouting.org' 
+				uri='http://www.frrouting.org/' />
 		</documentation>
 	</template>
 	</instance>
@@ -665,8 +665,8 @@
 		<documentation>
 			<manpage title='ospf6d' section='1M'
 				manpath='@mandir@' />
-			<doc_link name='freerangerouting.org' 
-				uri='http://www.freerangerouting.org/' />
+			<doc_link name='frrouting.org' 
+				uri='http://www.frrouting.org/' />
 		</documentation>
 	</template>
 	</instance>
@@ -818,8 +818,8 @@
 		<documentation>
 			<manpage title='bgpd' section='1M'
 				manpath='@mandir@' />
-			<doc_link name='freerangerouting.org' 
-				uri='http://www.freerangerouting.org/' />
+			<doc_link name='frrouting.org' 
+				uri='http://www.frrouting.org/' />
 		</documentation>
 	</template>
 	</instance>
diff --git a/solaris/pkginfo.tmpl.in b/solaris/pkginfo.tmpl.in
index 02abb0f96..89a281ceb 100644
--- a/solaris/pkginfo.tmpl.in
+++ b/solaris/pkginfo.tmpl.in
@@ -1,9 +1,9 @@
 ARCH="@target_cpu@"
 CATEGORY="system"
 VERSION="@PACKAGE_VERSION@,REV=@CONFDATE@"
-VENDOR="http://www.freerangerouting.org/"
+VENDOR="http://www.frrouting.org/"
 HOTLINE="@PACKAGE_BUGREPORT@"
-EMAIL=maintainers@freerangerouting.org
+EMAIL=maintainers@frrouting.org
 DESC="@PACKAGE_NAME@ Routing Protocols"
 MAXINST=1
 CLASSES="none preserve renamenew manifest"