diff --git a/INSTALL.md b/INSTALL.md
index 7751a0e4..fb0ef74f 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -4,7 +4,7 @@ This document contains instructions for installing forked-daapd from the git
 tree.
 
 The source for this version of forked-daapd can be found here:
-[ejurgensen/forked-daapd](https://github.com/ejurgensen/forked-daapd.git)
+[owntone/forked-daapd](https://github.com/owntone/forked-daapd.git)
 
 The original (now unmaintained) source can be found here:
 [jblache/forked-daapd](http://git.debian.org/?p=users/jblache/forked-daapd.git)
@@ -50,7 +50,7 @@ Optional packages:
 Then run the following (adding configure arguments for optional features):
 
 ```bash
-git clone https://github.com/ejurgensen/forked-daapd.git
+git clone https://github.com/owntone/forked-daapd.git
 cd forked-daapd
 autoreconf -i
 ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
@@ -80,7 +80,7 @@ sudo yum install \
 Clone the forked-daapd repo:
 
 ```bash
-git clone https://github.com/ejurgensen/forked-daapd.git
+git clone https://github.com/owntone/forked-daapd.git
 cd forked-daapd
 ```
 
@@ -175,7 +175,7 @@ Optional features require the following additional ports:
 Clone the forked-daapd repo:
 
 ```bash
-git clone https://github.com/ejurgensen/forked-daapd.git
+git clone https://github.com/owntone/forked-daapd.git
 cd forked-daapd
 ```
 
diff --git a/README.md b/README.md
index 8777075d..d494dc9d 100644
--- a/README.md
+++ b/README.md
@@ -126,7 +126,7 @@ with remotes, select speakers, authenticate with Spotify, etc.
 The Debian forked-daapd package does not include the web interface due to Debian
 packaging rules.
 
-You can find some screenshots and build instructions in [README_PLAYER_WEBINTERFACE.md](https://github.com/ejurgensen/forked-daapd/blob/master/README_PLAYER_WEBINTERFACE.md).
+You can find some screenshots and build instructions in [README_PLAYER_WEBINTERFACE.md](https://github.com/owntone/forked-daapd/blob/master/README_PLAYER_WEBINTERFACE.md).
 
 ## Using Remote
 
@@ -228,7 +228,7 @@ When using ALSA, the server will try to syncronize playback with AirPlay. You
 can adjust the syncronization in the config file.
 
 For most setups the default values in the config file should work. If they
-don't, there is help here: [README_ALSA.md](https://github.com/ejurgensen/forked-daapd/blob/master/README_ALSA.md)
+don't, there is help here: [README_ALSA.md](https://github.com/owntone/forked-daapd/blob/master/README_ALSA.md)
 
 
 ## Local audio, Bluetooth and more through Pulseaudio
@@ -236,7 +236,7 @@ don't, there is help here: [README_ALSA.md](https://github.com/ejurgensen/forked
 In the config file, you can select Pulseaudio for local audio. In addition to
 local audio, Pulseaudio also supports an array of other targets, e.g. Bluetooth
 or DLNA. However, Pulseaudio does require some setup, so here is a separate page
-with some help on that: [README_PULSE.md](https://github.com/ejurgensen/forked-daapd/blob/master/README_PULSE.md)
+with some help on that: [README_PULSE.md](https://github.com/owntone/forked-daapd/blob/master/README_PULSE.md)
 
 Note that if you select Pulseaudio the "card" setting in the config file has
 no effect. Instead all soundcards detected by Pulseaudio will be listed as
@@ -323,11 +323,11 @@ the iTunes DB; use itunes_overrides = true if you prefer iTunes' metadata.
 
 forked-daapd has support for smart playlists. How to create a smart playlist is
 documented in
-[README_SMARTPL.md](https://github.com/ejurgensen/forked-daapd/blob/master/README_SMARTPL.md).
+[README_SMARTPL.md](https://github.com/owntone/forked-daapd/blob/master/README_SMARTPL.md).
 
 If you're not satisfied with internet radio metadata that forked-daapd shows,
 then you can read about tweaking it in
-[README_RADIO_STREAMS.md](https://github.com/ejurgensen/forked-daapd/blob/master/README_RADIO_STREAMS.md).
+[README_RADIO_STREAMS.md](https://github.com/owntone/forked-daapd/blob/master/README_RADIO_STREAMS.md).
 
 
 ## Artwork
@@ -452,7 +452,7 @@ not necessary during normal operation.
 You can choose between:
 
 - a [MPD command line client](#mpd-clients) (easiest) like `mpc`
-- curl with forked-daapd's JSON API (see [README_JSON_API.md](https://github.com/ejurgensen/forked-daapd/blob/master/README_JSON_API.md))
+- curl with forked-daapd's JSON API (see [README_JSON_API.md](https://github.com/owntone/forked-daapd/blob/master/README_JSON_API.md))
 - curl with DAAP/DACP commands (hardest)
 
 Here is an example of how to use curl with DAAP/DACP. Say you have a playlist
@@ -584,32 +584,32 @@ The following table shows what is working for a selection of MPD clients:
 
 The source for this version of forked-daapd can be found here:
 
-  [https://github.com/ejurgensen/forked-daapd.git](https://github.com/ejurgensen/forked-daapd.git)
+  [https://github.com/owntone/forked-daapd.git](https://github.com/owntone/forked-daapd.git)
 
 README's for previous versions of forked-daapd:
 
-  [forked-daapd version 27.4](https://github.com/ejurgensen/forked-daapd/blob/27.4/README.md)
+  [forked-daapd version 27.4](https://github.com/owntone/forked-daapd/blob/27.4/README.md)
 
-  [forked-daapd version 27.2](https://github.com/ejurgensen/forked-daapd/blob/27.2/README.md)
+  [forked-daapd version 27.2](https://github.com/owntone/forked-daapd/blob/27.2/README.md)
 
-  [forked-daapd version 27.1](https://github.com/ejurgensen/forked-daapd/blob/27.1/README.md)
+  [forked-daapd version 27.1](https://github.com/owntone/forked-daapd/blob/27.1/README.md)
 
-  [forked-daapd version 27.0](https://github.com/ejurgensen/forked-daapd/blob/27.0/README.md)
+  [forked-daapd version 27.0](https://github.com/owntone/forked-daapd/blob/27.0/README.md)
 
-  [forked-daapd version 26.5](https://github.com/ejurgensen/forked-daapd/blob/26.5/README.md)
+  [forked-daapd version 26.5](https://github.com/owntone/forked-daapd/blob/26.5/README.md)
 
-  [forked-daapd version 26.4](https://github.com/ejurgensen/forked-daapd/blob/26.4/README.md)
+  [forked-daapd version 26.4](https://github.com/owntone/forked-daapd/blob/26.4/README.md)
 
-  [forked-daapd version 26.3](https://github.com/ejurgensen/forked-daapd/blob/26.3/README.md)
+  [forked-daapd version 26.3](https://github.com/owntone/forked-daapd/blob/26.3/README.md)
 
-  [forked-daapd version 26.2](https://github.com/ejurgensen/forked-daapd/blob/26.2/README.md)
+  [forked-daapd version 26.2](https://github.com/owntone/forked-daapd/blob/26.2/README.md)
 
-  [forked-daapd version 26.1](https://github.com/ejurgensen/forked-daapd/blob/26.1/README.md)
+  [forked-daapd version 26.1](https://github.com/owntone/forked-daapd/blob/26.1/README.md)
 
-  [forked-daapd version 26.0](https://github.com/ejurgensen/forked-daapd/blob/26.0/README.md)
+  [forked-daapd version 26.0](https://github.com/owntone/forked-daapd/blob/26.0/README.md)
 
-  [forked-daapd version 25.0](https://github.com/ejurgensen/forked-daapd/blob/25.0/README.md)
+  [forked-daapd version 25.0](https://github.com/owntone/forked-daapd/blob/25.0/README.md)
 
-  [forked-daapd version 24.2](https://github.com/ejurgensen/forked-daapd/blob/24.2/README.md)
+  [forked-daapd version 24.2](https://github.com/owntone/forked-daapd/blob/24.2/README.md)
 
-  [forked-daapd version 24.1](https://github.com/ejurgensen/forked-daapd/blob/24.1/README.md)
+  [forked-daapd version 24.1](https://github.com/owntone/forked-daapd/blob/24.1/README.md)
diff --git a/README_JSON_API.md b/README_JSON_API.md
index fe3694b2..73fa0685 100644
--- a/README_JSON_API.md
+++ b/README_JSON_API.md
@@ -2137,7 +2137,7 @@ curl -X GET "http://localhost:3689/api/search?type=tracks,artists,albums,playlis
 
 ### Search by query language
 
-Search for artists, albums, tracks by a smart playlist query expression (see [README_SMARTPL.md](https://github.com/ejurgensen/forked-daapd/blob/master/README_SMARTPL.md) for the expression syntax).
+Search for artists, albums, tracks by a smart playlist query expression (see [README_SMARTPL.md](https://github.com/owntone/forked-daapd/blob/master/README_SMARTPL.md) for the expression syntax).
 
 **Endpoint**
 
diff --git a/README_PLAYER_WEBINTERFACE.md b/README_PLAYER_WEBINTERFACE.md
index 36fec9ff..b36d7075 100644
--- a/README_PLAYER_WEBINTERFACE.md
+++ b/README_PLAYER_WEBINTERFACE.md
@@ -1,6 +1,6 @@
 # forked-daapd player web interface
 
-Mobile friendly player web interface for [forked-daapd](http://ejurgensen.github.io/forked-daapd/) build with [Vue.js](https://vuejs.org), [Bulma](http://bulma.io).
+Mobile friendly player web interface for [forked-daapd](http://owntone.github.io/forked-daapd/) build with [Vue.js](https://vuejs.org), [Bulma](http://bulma.io).
 
 ## Screenshots
 
@@ -37,4 +37,4 @@ npm run build
 npm run build --report
 ```
 
-After running `npm run dev` the web interface is reachable at [localhost:8080](http://localhost:8080). By default it expects **forked-daapd** to be running at [localhost:3689](http://localhost:3689) and proxies all JSON API calls to this location. If **forked-daapd** is running at a different location you need to modify the `proxyTable` configuration in `config/index.js`
\ No newline at end of file
+After running `npm run dev` the web interface is reachable at [localhost:8080](http://localhost:8080). By default it expects **forked-daapd** to be running at [localhost:3689](http://localhost:3689) and proxies all JSON API calls to this location. If **forked-daapd** is running at a different location you need to modify the `proxyTable` configuration in `config/index.js`
diff --git a/forked-daapd.8 b/forked-daapd.8
index 56a0bc69..da8f5764 100644
--- a/forked-daapd.8
+++ b/forked-daapd.8
@@ -56,5 +56,5 @@ Don't announce web interface via mDNS.
  \fI/var/cache/forked\-daapd\fR
 .fi
 .SH SEE ALSO
-See \fIhttp://ejurgensen.github.io/forked-daapd/\fR for more in-depth information
+See \fIhttp://owntone.github.io/forked-daapd/\fR for more in-depth information
 about using \fBforked-daapd\fP.
diff --git a/forked-daapd.spec.in b/forked-daapd.spec.in
index b21dd510..c5774b26 100644
--- a/forked-daapd.spec.in
+++ b/forked-daapd.spec.in
@@ -17,8 +17,8 @@ Version: @PACKAGE_VERSION@
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
-Url: https://github.com/ejurgensen/forked-daapd
-Source0: https://github.com/ejurgensen/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
+Url: https://github.com/owntone/forked-daapd
+Source0: https://github.com/owntone/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
 %{?systemd_ordering}
 BuildRequires: gcc, make, systemd, pkgconfig, libunistring-devel
 BuildRequires: pkgconfig(zlib), pkgconfig(libconfuse), pkgconfig(mxml)
diff --git a/scripts/freebsd_install_11.0.sh b/scripts/freebsd_install_11.0.sh
index 6587aca7..d80f4855 100644
--- a/scripts/freebsd_install_11.0.sh
+++ b/scripts/freebsd_install_11.0.sh
@@ -71,7 +71,7 @@ fi
 
 read -p "Should the script build forked-daapd? [y/N] " yn
 if [ "$yn" = "y" ]; then
-	git clone https://github.com/ejurgensen/forked-daapd.git
+	git clone https://github.com/owntone/forked-daapd.git
 	cd forked-daapd
 
 	#Cleanup in case this is a re-run
diff --git a/src/mxml-compat.h b/src/mxml-compat.h
index 80866dd5..c69f5153 100644
--- a/src/mxml-compat.h
+++ b/src/mxml-compat.h
@@ -91,7 +91,7 @@ compat_mxmlDelete(mxml_node_t *node)
 
 // Debian 10.x amd64 w/mxml 2.12 has a mxmlNewTextf that causes segfault when
 // mxmlSaveString or mxmlSaveAllocString is called,
-// ref https://github.com/ejurgensen/forked-daapd/issues/938
+// ref https://github.com/owntone/forked-daapd/issues/938
 #if (MXML_MAJOR_VERSION == 2) && (MXML_MINOR_VERSION == 12)
 
 #include <stdarg.h>
diff --git a/src/outputs/airplay.c b/src/outputs/airplay.c
index 09735928..2b14d8f1 100644
--- a/src/outputs/airplay.c
+++ b/src/outputs/airplay.c
@@ -96,7 +96,7 @@
 // ATV4 and Homepod disconnect for reasons that are not clear, but sending them
 // progress metadata at regular intervals reduces the problem. The below
 // interval was determined via testing, see:
-// https://github.com/ejurgensen/forked-daapd/issues/734#issuecomment-622959334
+// https://github.com/owntone/forked-daapd/issues/734#issuecomment-622959334
 #define AIRPLAY_KEEP_ALIVE_INTERVAL   25
 
 // This is an arbitrary value which just needs to be kept in sync with the config
@@ -4177,7 +4177,7 @@ airplay_device_cb(const char *name, const char *type, const char *domain, const
     DPRINTF(E_LOG, L_AIRPLAY, "AirPlay device '%s': am has no value\n", name);
 
   // If the user didn't set any reconnect setting we enable for Apple TV and
-  // HomePods due to https://github.com/ejurgensen/forked-daapd/issues/734
+  // HomePods due to https://github.com/owntone/forked-daapd/issues/734
   cfgopt = devcfg ? cfg_getopt(devcfg, "reconnect") : NULL;
   if (cfgopt && cfgopt->nvalues == 1)
     rd->resurrect = cfg_opt_getnbool(cfgopt, 0);
diff --git a/src/outputs/raop.c b/src/outputs/raop.c
index 696f9e75..f17e0961 100644
--- a/src/outputs/raop.c
+++ b/src/outputs/raop.c
@@ -91,7 +91,7 @@
 // ATV4 and Homepod disconnect for reasons that are not clear, but sending them
 // progress metadata at regular intervals reduces the problem. The below
 // interval was determined via testing, see:
-// https://github.com/ejurgensen/forked-daapd/issues/734#issuecomment-622959334
+// https://github.com/owntone/forked-daapd/issues/734#issuecomment-622959334
 #define RAOP_KEEP_ALIVE_INTERVAL   25
 
 // This is an arbitrary value which just needs to be kept in sync with the config
@@ -4583,7 +4583,7 @@ raop_device_cb(const char *name, const char *type, const char *domain, const cha
     DPRINTF(E_LOG, L_RAOP, "AirPlay device '%s': am has no value\n", device_name);
 
   // If the user didn't set any reconnect setting we enable for Apple TV and
-  // HomePods due to https://github.com/ejurgensen/forked-daapd/issues/734
+  // HomePods due to https://github.com/owntone/forked-daapd/issues/734
   cfgopt = devcfg ? cfg_getopt(devcfg, "reconnect") : NULL;
   if (cfgopt && cfgopt->nvalues == 1)
     rd->resurrect = cfg_opt_getnbool(cfgopt, 0);