diff --git a/.ci/build-deps.sh b/.ci/build-deps.sh
index 8d257076..e1a3e14a 100755
--- a/.ci/build-deps.sh
+++ b/.ci/build-deps.sh
@@ -33,7 +33,7 @@ fi
 
 if [ "$BRPVXS" ]
 then
-    git clone --quiet --recursive --depth 5 --branch "$BRPVXS" https://github.com/mdavidsaver/pvxs.git pvxs
+    git clone --quiet --recursive --depth 5 --branch "$BRPVXS" https://github.com/epics-base/pvxs.git pvxs
     (cd pvxs && git log -n1 )
     cat << EOF >> $CURDIR/configure/RELEASE.local
 PVXS=$HOME/.source/pvxs
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e46cd642..79ffdea6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -422,7 +422,7 @@ jobs:
         run: python -m twine check dist/p4p*.tar.*
 
       - name: Upload wheels
-        if: github.event_name=='push' && github.repository=='mdavidsaver/p4p' && github.ref=='refs/heads/master' && !matrix.base && !matrix.source
+        if: github.event_name=='push' && github.repository=='epics-base/p4p' && github.ref=='refs/heads/master' && !matrix.base && !matrix.source
         env:
           TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
           TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
@@ -430,7 +430,7 @@ jobs:
           python -m twine upload --skip-existing dist/p4p*.whl
 
       - name: Upload source
-        if: github.event_name=='push' && github.repository=='mdavidsaver/p4p' && github.ref=='refs/heads/master' && matrix.source && !matrix.base
+        if: github.event_name=='push' && github.repository=='epics-base/p4p' && github.ref=='refs/heads/master' && matrix.source && !matrix.base
         env:
           TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
           TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
diff --git a/README.md b/README.md
index 0c03c3ca..30742979 100644
--- a/README.md
+++ b/README.md
@@ -11,12 +11,12 @@ Python bindings for the PVAccess network client and server.
 
 See documentation
 
-https://mdavidsaver.github.io/p4p/
+https://epics-base.github.io/p4p/
 
 Source
 
-https://github.com/mdavidsaver/p4p/
+https://github.com/epics-base/p4p/
 
 CI results
 
-![Github Actions](https://github.com/mdavidsaver/p4p/workflows/P4P/badge.svg)
+![Github Actions](https://github.com/epics-base/p4p/workflows/P4P/badge.svg)
diff --git a/documentation/building.rst b/documentation/building.rst
index 4fa6f0aa..46b6df3c 100644
--- a/documentation/building.rst
+++ b/documentation/building.rst
@@ -4,7 +4,7 @@
 Building
 ========
 
-Release tars available from https://github.com/mdavidsaver/p4p/releases
+Release tars available from https://github.com/epics-base/p4p/releases
 
 The P4P modules requires:
 
@@ -104,7 +104,7 @@ or with PIP::
 
 From from versioned source.  (may replace "master" with release version number)::
 
-   git clone --branch master https://github.com/mdavidsaver/p4p.git
+   git clone --branch master https://github.com/epics-base/p4p.git
    cd p4p
 
 Set location of EPICS modules.  With EPICS >= 7.0.2::
@@ -152,7 +152,7 @@ If the necessary EPICS modules are not present, then they may be built from sour
 
    sudo apt-get install libreadline6-dev libncurses5-dev perl
    git clone https://github.com/epics-base/epics-base.git
-   git clone https://github.com/mdavidsaver/pvxs.git
+   git clone https://github.com/epics-base/pvxs.git
    cat <<EOF > pvxs/configure/RELEASE.local
    EPICS_BASE=$PWD/epics-base
    EOF
diff --git a/documentation/gw.rst b/documentation/gw.rst
index 24bc1a79..b366909d 100644
--- a/documentation/gw.rst
+++ b/documentation/gw.rst
@@ -231,9 +231,9 @@ Configuration is provided as a file using JSON syntax with C-style comments. ::
 
 See also PVXS client_ and server_ configuration references.
 
-.. _client: https://mdavidsaver.github.io/pvxs/client.html#configuration
+.. _client: https://epics-base.github.io/pvxs/client.html#configuration
 
-.. _server: https://mdavidsaver.github.io/pvxs/server.html#configuration
+.. _server: https://epics-base.github.io/pvxs/server.html#configuration
 
 Run ``pvagw --example-config -`` to see another example configuration.
 
diff --git a/documentation/index.rst b/documentation/index.rst
index c1f48430..fbda1843 100644
--- a/documentation/index.rst
+++ b/documentation/index.rst
@@ -19,8 +19,8 @@ The recommended starting point is to install from pypi.org. ::
     python -m pip install p4p nose2
     python -m nose2 p4p   # Optional: runs automatic tests
 
-- VCS: https://github.com/mdavidsaver/p4p
-- Docs: https://mdavidsaver.github.io/p4p/
+- VCS: https://github.com/epics-base/p4p
+- Docs: https://epics-base.github.io/p4p/
 
 Contents:
 
diff --git a/documentation/values.rst b/documentation/values.rst
index fa5a5606..b2d5a1c0 100644
--- a/documentation/values.rst
+++ b/documentation/values.rst
@@ -278,6 +278,6 @@ API Reference
 Relation to C++ API
 -------------------
 
-For those familiar with the `PVXS <https://mdavidsaver.github.io/pvxs/>` API.
+For those familiar with the `PVXS <https://epics-base.github.io/pvxs/>` API.
 A :py:class:`Type` wraps a TypeDef.
 :py:class:`Value` wraps a Value.
diff --git a/setup.py b/setup.py
index 82d8a852..b8663d5a 100755
--- a/setup.py
+++ b/setup.py
@@ -99,7 +99,7 @@ def get_numpy_include_dirs():
     description="Python interface to PVAccess protocol client",
     long_description=long_description,
     long_description_content_type='text/markdown',
-    url='https://mdavidsaver.github.io/p4p',
+    url='https://epics-base.github.io/p4p',
     author='Michael Davidsaver',
     author_email='mdavidsaver@gmail.com',
     license='BSD',