diff --git a/README.md b/README.md
index 0f6e1c5..08f8827 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 
 WireGuard is a novel VPN that runs inside the Linux Kernel and utilizes **state-of-the-art cryptography**. It aims to be faster, simpler, leaner, and more useful than IPSec, while avoiding the massive headache. It intends to be considerably more performant than OpenVPN. WireGuard is designed as a general purpose VPN for running on embedded interfaces and super computers alike, fit for many different circumstances. It runs over UDP.
 
-**More information may be found at [WireGuard.io](https://www.wireguard.io/).**
+**More information may be found at [WireGuard.com](https://www.wireguard.com/).**
 
 ## License
 
diff --git a/contrib/external-tests/go/main.go b/contrib/external-tests/go/main.go
index e3627f3..9b60636 100644
--- a/contrib/external-tests/go/main.go
+++ b/contrib/external-tests/go/main.go
@@ -51,7 +51,7 @@ func main() {
 		StaticKeypair:         noise.DHKey{Private: ourPrivate, Public: ourPublic},
 		PeerStatic:            theirPublic,
 	})
-	conn, err := net.Dial("udp", "demo.wireguard.io:12913")
+	conn, err := net.Dial("udp", "demo.wireguard.com:12913")
 	if err != nil {
 		log.Fatalf("error dialing udp socket: %s", err)
 	}
diff --git a/contrib/external-tests/haskell/src/Main.hs b/contrib/external-tests/haskell/src/Main.hs
index b0b7503..7863829 100644
--- a/contrib/external-tests/haskell/src/Main.hs
+++ b/contrib/external-tests/haskell/src/Main.hs
@@ -57,7 +57,7 @@ unsafeMessage write mpsk msg ns = case operation msg ns of
 
 main :: IO ()
 main = do
-  let ip           = "demo.wireguard.io"
+  let ip           = "demo.wireguard.com"
       port         = "12913"
       myKeyB64     = "WAmgVYXkbT2bCtdcDwolI88/iVi/aV3/PHcUBTQSYmo=" -- private key
       serverKeyB64 = "qRCwZSKInrMAq5sepfCdaCsRJaoLe5jhtzfiw7CjbwM=" -- public key
diff --git a/contrib/external-tests/rust/src/main.rs b/contrib/external-tests/rust/src/main.rs
index 9fb0f5a..fdd220e 100644
--- a/contrib/external-tests/rust/src/main.rs
+++ b/contrib/external-tests/rust/src/main.rs
@@ -17,7 +17,7 @@ use pnet::packet::icmp::{MutableIcmpPacket, IcmpTypes, echo_reply, echo_request,
 use std::net::*;
 use std::str::FromStr;
 
-static TEST_SERVER: &'static str = "demo.wireguard.io:12913";
+static TEST_SERVER: &'static str = "demo.wireguard.com:12913";
 
 fn memcpy(out: &mut [u8], data: &[u8]) {
 	out[..data.len()].copy_from_slice(data);
diff --git a/contrib/nat-hole-punching/nat-punch-client.c b/contrib/nat-hole-punching/nat-punch-client.c
index 65f3249..aa00d35 100644
--- a/contrib/nat-hole-punching/nat-punch-client.c
+++ b/contrib/nat-hole-punching/nat-punch-client.c
@@ -140,7 +140,7 @@ int main(int argc, char *argv[])
 	const char *server = argv[1], *interface = argv[2];
 
 	if (argc < 3) {
-		fprintf(stderr, "Usage: %s SERVER WIREGUARD_INTERFACE\nExample:\n    %s demo.wireguard.io wg0\n", argv[0], argv[0]);
+		fprintf(stderr, "Usage: %s SERVER WIREGUARD_INTERFACE\nExample:\n    %s demo.wireguard.com wg0\n", argv[0], argv[0]);
 		return EINVAL;
 	}
 
diff --git a/contrib/ncat-client-server/README b/contrib/ncat-client-server/README
index f584829..0c0667a 100644
--- a/contrib/ncat-client-server/README
+++ b/contrib/ncat-client-server/README
@@ -11,6 +11,6 @@ That all said, this is a pretty cool example of just how
 darn easy WireGuard can be.
 
 Disclaimer:
-  The `demo.wireguard.io` server in client.sh is for testing
+  The `demo.wireguard.com` server in client.sh is for testing
   purposes only. You may not use this server for abusive or
   illegal purposes.
diff --git a/contrib/ncat-client-server/client.sh b/contrib/ncat-client-server/client.sh
index b49a05e..1d30f49 100755
--- a/contrib/ncat-client-server/client.sh
+++ b/contrib/ncat-client-server/client.sh
@@ -6,13 +6,13 @@ set -e
 [[ $UID == 0 ]] || { echo "You must be root to run this."; exit 1; }
 umask 077
 trap 'rm -f /tmp/wg_private_key' EXIT INT TERM
-exec 3<>/dev/tcp/demo.wireguard.io/42912
+exec 3<>/dev/tcp/demo.wireguard.com/42912
 wg genkey | tee /tmp/wg_private_key | wg pubkey >&3
 IFS=: read -r status server_pubkey server_port internal_ip <&3
 [[ $status == OK ]]
 ip link del dev wg0 2>/dev/null || true
 ip link add dev wg0 type wireguard
-wg set wg0 private-key /tmp/wg_private_key peer "$server_pubkey" allowed-ips 0.0.0.0/0 endpoint "demo.wireguard.io:$server_port" persistent-keepalive 25
+wg set wg0 private-key /tmp/wg_private_key peer "$server_pubkey" allowed-ips 0.0.0.0/0 endpoint "demo.wireguard.com:$server_port" persistent-keepalive 25
 ip address add "$internal_ip"/24 dev wg0
 ip link set up dev wg0
 if [ "$1" == "default-route" ]; then
diff --git a/src/wg-quick.8 b/src/wg-quick.8
index ceee026..04653a8 100644
--- a/src/wg-quick.8
+++ b/src/wg-quick.8
@@ -114,7 +114,7 @@ traffic:
 .br
     AllowedIPs = 0.0.0.0/0 
 .br
-    Endpoint = demo.wireguard.io:51820 
+    Endpoint = demo.wireguard.com:51820 
 .br
 
 Notice that the `PostUp` and `PostDown` commands are used here to configure DNS using
@@ -193,6 +193,6 @@ was written by
 Jason A. Donenfeld
 .ME .
 For updates and more information, a project page is available on the
-.UR https://\:www.wireguard.io/
+.UR https://\:www.wireguard.com/
 World Wide Web
 .UE .
diff --git a/src/wg-quick@.service b/src/wg-quick@.service
index f5f4e8f..ce6d70a 100644
--- a/src/wg-quick@.service
+++ b/src/wg-quick@.service
@@ -4,8 +4,8 @@ After=network-online.target
 Wants=network-online.target
 Documentation=man:wg-quick(8)
 Documentation=man:wg(8)
-Documentation=https://www.wireguard.io/
-Documentation=https://www.wireguard.io/quickstart/
+Documentation=https://www.wireguard.com/
+Documentation=https://www.wireguard.com/quickstart/
 Documentation=https://git.zx2c4.com/WireGuard/about/src/tools/wg-quick.8
 Documentation=https://git.zx2c4.com/WireGuard/about/src/tools/wg.8
 
diff --git a/src/wg.8 b/src/wg.8
index 1517432..612fb4e 100644
--- a/src/wg.8
+++ b/src/wg.8
@@ -200,7 +200,7 @@ ignored.
 .br
     PublicKey = gN65BkIKy1eCE9pP1wdc8ROUtkHLF2PfAqYdyYBz6EA=
 .br
-    Endpoint = test.wireguard.io:18981
+    Endpoint = test.wireguard.com:18981
 .br
     AllowedIPs = 10.10.10.230/32
 
@@ -225,6 +225,6 @@ was written by
 Jason A. Donenfeld
 .ME .
 For updates and more information, a project page is available on the
-.UR https://\:www.wireguard.io/
+.UR https://\:www.wireguard.com/
 World Wide Web
 .UE .