diff --git a/build/ami b/build/ami
index 364b87c..314f261 100755
--- a/build/ami
+++ b/build/ami
@@ -31,7 +31,7 @@ customise() {
     # In case we are preparing a pre-release, temporarily add staging
     lVERSION="`echo $VERSION | sed 's/[a-z]//g'`"
     pkg -R $ALTROOT set-publisher \
-        -g https://pkg.omniosce.org/r$lVERSION/staging omnios || true
+        -g https://pkg.omnios.org/r$lVERSION/staging omnios || true
 
     # Allow root to ssh in
     log "...setting PermitRootLogin=yes in sshd_config"
@@ -53,7 +53,7 @@ autoboot_delay=1
 EOM
 
     pkg -R $ALTROOT set-publisher \
-        -G https://pkg.omniosce.org/r$lVERSION/staging omnios || true
+        -G https://pkg.omnios.org/r$lVERSION/staging omnios || true
 
     Postboot '/sbin/dladm | tee /dev/msglog'
     Postboot '/sbin/ipadm create-if xnf0 | tee /dev/msglog'
@@ -83,7 +83,7 @@ vmdkver=0.2
 dir=VMDK-stream-converter-$vmdkver
 file=$dir.tar.gz
 if [ ! -d $dir ]; then
-    wget -O /tmp/$file https://mirrors.omniosce.org/vmdk/$file
+    wget -O /tmp/$file https://mirrors.omnios.org/vmdk/$file
     gtar zxf /tmp/$file
 fi
 
diff --git a/build/build_dialog b/build/build_dialog
index b79ebb3..b61bbc9 100755
--- a/build/build_dialog
+++ b/build/build_dialog
@@ -14,7 +14,7 @@
 
 # Copyright 2018 OmniOS Community Edition (OmniOSce) Association.
 
-SITE=https://mirrors.omniosce.org/dialog
+SITE=https://mirrors.omnios.org/dialog
 VER=1.3-20170509
 FILE=dialog-$VER.tgz
 URL=$SITE/$FILE
diff --git a/build/build_ipcalc b/build/build_ipcalc
index 79114da..314000e 100755
--- a/build/build_ipcalc
+++ b/build/build_ipcalc
@@ -2,7 +2,7 @@
 
 # Copyright 2017 OmniOS Community Edition (OmniOSce) Association.
 
-MIRROR=https://mirrors.omniosce.org
+MIRROR=https://mirrors.omnios.org
 PROG=ipcalc
 VER=0.2.0
 FILE=$PROG-$VER.tar.gz
diff --git a/build/build_miniroot b/build/build_miniroot
index b4a40ab..b038cad 100755
--- a/build/build_miniroot
+++ b/build/build_miniroot
@@ -25,7 +25,7 @@ fail() {
 # Change "bloody" to whatever release the current branch is.
 PUBLISHER=omnios
 [ -x /opt/ooce/bin/pigz ] && GZIP=/opt/ooce/bin/pigz || GZIP=gzip
-: ${PKGURL:=https://pkg.omniosce.org/bloody/core}
+: ${PKGURL:=https://pkg.omnios.org/bloody/core}
 : ${GZIP_CMD:=$GZIP}
 SRCDIR=$(dirname $0)
 DIDWORK=0
diff --git a/build/build_zfs_send b/build/build_zfs_send
index 3de753a..659d6ed 100755
--- a/build/build_zfs_send
+++ b/build/build_zfs_send
@@ -31,7 +31,7 @@ MYDIR=$PWD/`dirname $BASH_SOURCE[0]`
 PUBLISHER=omnios
 # NOTE --> The URL needs to be updated with every release.
 # Change "bloody" to whatever release the current branch is.
-OMNIOS_URL=https://pkg.omniosce.org/bloody/core
+OMNIOS_URL=https://pkg.omnios.org/bloody/core
 : ${PKGURL:=$OMNIOS_URL}
 ZROOT=rpool
 OUT=