diff --git a/README.md b/README.md
index 70b3fba0e..63106a4c0 100644
--- a/README.md
+++ b/README.md
@@ -4,10 +4,10 @@
 
 Strawberry is a music player and music collection organizer. It is a fork of Clementine released in 2018 aimed at music collectors, audio enthusiasts and audiophiles. The name is inspired by the band Strawbs. It's based on a heavily modified version of Clementine created in 2012-2013. It's written in C++ and Qt 5.
 
-  * Website: https://www.strawbs.org/
+  * Website: https://www.strawberrymusicplayer.org/
   * Github: https://github.com/jonaski/strawberry
-  * Buildbot: http://buildbot.strawbs.net/
-  * Latest builds: https://builds.strawbs.org/
+  * Buildbot: http://buildbot.strawberrymusicplayer.org/
+  * Latest builds: https://builds.strawberrymusicplayer.org/
 
 ### :heavy_check_mark: Features:
 
@@ -84,7 +84,7 @@ You should also install the gstreamer plugins base and good, and optionally bad
 ### :computer:	Screenshot
 
 
-![Browse](https://www.strawbs.org/pictures/screenshot-002-large.png)
+![Browse](https://www.strawberrymusicplayer.org/pictures/screenshot-002-large.png)
 
 ### :moneybag: Donate
 
diff --git a/data/html/oauthsuccess.html b/data/html/oauthsuccess.html
index 752655469..ba7680304 100644
--- a/data/html/oauthsuccess.html
+++ b/data/html/oauthsuccess.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <html>
   <head>
-    <link href="http://www.strawbs.org/favicon.ico" rel="shortcut icon">
+    <link href="https://www.strawberrymusicplayer.org/favicon.ico" rel="shortcut icon">
     <title>tr("Return to Strawberry")</title>
 
     <style>
diff --git a/debian/control b/debian/control
index c4e3fd1b3..542ad6989 100644
--- a/debian/control
+++ b/debian/control
@@ -44,7 +44,7 @@ Depends: ${shlibs:Depends},
          gstreamer1.0-plugins-good,
          gstreamer1.0-alsa,
          gstreamer1.0-pulseaudio
-Homepage: http://www.strawbs.org/
+Homepage: http://www.strawberrymusicplayer.org/
 Description: Audio player and music collection organizer
  Strawberry is a music player aimed at music collectors, audio enthusiasts and audiophiles.
  .
diff --git a/debian/copyright b/debian/copyright
index be6f1813a..62ac19b0b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: strawberry
 Upstream-Contact: Jonas Kvinge <jonas@jkvinge.net>
-Source: https://www.strawbs.org/
+Source: https://www.strawberrymusicplayer.org/
 
 Files: *
 Copyright: 2010-2015, David Sansome <me@davidsansome.com>
diff --git a/dist/CMakeLists.txt b/dist/CMakeLists.txt
index a21a793bf..a2366cbd7 100644
--- a/dist/CMakeLists.txt
+++ b/dist/CMakeLists.txt
@@ -15,8 +15,8 @@ if (UNIX AND NOT APPLE)
   install(FILES ../data/icons/48x48/strawberry.png DESTINATION share/icons/hicolor/48x48/apps/)
   install(FILES ../data/icons/64x64/strawberry.png DESTINATION share/icons/hicolor/64x64/apps/)
   install(FILES ../data/icons/128x128/strawberry.png DESTINATION share/icons/hicolor/128x128/apps/)
-  install(FILES unix/org.strawbs.strawberry.desktop DESTINATION share/applications)
-  install(FILES unix/org.strawbs.strawberry.appdata.xml DESTINATION share/metainfo)
+  install(FILES unix/org.strawberrymusicplayer.strawberry.desktop DESTINATION share/applications)
+  install(FILES unix/org.strawberrymusicplayer.strawberry.appdata.xml DESTINATION share/metainfo)
   install(FILES man/strawberry.1 man/strawberry-tagreader.1 DESTINATION share/man/man1)
 endif()
 
diff --git a/dist/macos/Info.plist.in b/dist/macos/Info.plist.in
index aac37ca0b..4b54c63a8 100644
--- a/dist/macos/Info.plist.in
+++ b/dist/macos/Info.plist.in
@@ -13,7 +13,7 @@
   <key>CFBundleIconFile</key>
   <string>strawberry.icns</string>
   <key>CFBundleIdentifier</key>
-  <string>org.strawbs.strawberry</string>
+  <string>org.strawberrymusicplayer.strawberry</string>
   <key>CFBundleInfoDictionaryVersion</key>
   <string>6.0</string>
   <key>CFBundleLongVersionString</key>
diff --git a/dist/pacman/PKGBUILD.in b/dist/pacman/PKGBUILD.in
index a65f11653..12c040878 100644
--- a/dist/pacman/PKGBUILD.in
+++ b/dist/pacman/PKGBUILD.in
@@ -4,7 +4,7 @@ pkgver=@STRAWBERRY_VERSION_PAC_V@
 pkgrel=@STRAWBERRY_VERSION_PAC_R@
 pkgdesc="A music player aimed at audio enthusiasts and music collectors"
 arch=(x86_64)
-url="http://www.strawbs.org/"
+url="https://www.strawberrymusicplayer.org/"
 license=(GPL3)
 makedepends=(git cmake make gcc boost gettext qt5-tools)
 depends=(
diff --git a/dist/rpm/strawberry.spec.in b/dist/rpm/strawberry.spec.in
index d6d981437..60f248998 100644
--- a/dist/rpm/strawberry.spec.in
+++ b/dist/rpm/strawberry.spec.in
@@ -4,7 +4,7 @@ Release:        @STRAWBERRY_VERSION_RPM_R@.@RPM_DISTRO@
 Summary:        A music player and music collection organiser
 Group:          Applications/Multimedia
 License:        GPL-3.0+
-URL:            http://www.strawbs.org/
+URL:            https://www.strawberrymusicplayer.org/
 Source0:        %{name}-@STRAWBERRY_VERSION_PACKAGE@.tar.xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -146,11 +146,11 @@ Features:
 %endif
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1500
-rm -f %{buildroot}%{_datadir}/metainfo/org.strawbs.strawberry.appdata.xml
+rm -f %{buildroot}%{_datadir}/metainfo/org.strawberrymusicplayer.strawberry.appdata.xml
 %endif
 
 %if 0%{?suse_version}
-  %suse_update_desktop_file org.strawbs.strawberry Qt AudioVideo Audio Player
+  %suse_update_desktop_file org.strawberrymusicplayer.strawberry Qt AudioVideo Audio Player
 %endif
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1500
@@ -164,12 +164,12 @@ rm -f %{buildroot}%{_datadir}/metainfo/org.strawbs.strawberry.appdata.xml
 %endif
 
 %check
-desktop-file-validate %{buildroot}%{_datadir}/applications/org.strawbs.strawberry.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/org.strawberrymusicplayer.strawberry.desktop
 %if 0%{?fedora_version}
-  appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.strawbs.strawberry.appdata.xml
+  appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.strawberrymusicplayer.strawberry.appdata.xml
 %else
   %if ! 0%{?suse_version} || ( 0%{?suse_version} && 0%{?suse_version} >= 1500 )
-    appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.strawbs.strawberry.appdata.xml
+    appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.strawberrymusicplayer.strawberry.appdata.xml
   %endif
 %endif
 
diff --git a/dist/unix/org.strawbs.strawberry.appdata.xml b/dist/unix/org.strawberrymusicplayer.strawberry.appdata.xml
similarity index 81%
rename from dist/unix/org.strawbs.strawberry.appdata.xml
rename to dist/unix/org.strawberrymusicplayer.strawberry.appdata.xml
index a4571b373..c4711e0aa 100644
--- a/dist/unix/org.strawbs.strawberry.appdata.xml
+++ b/dist/unix/org.strawberrymusicplayer.strawberry.appdata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component>
-  <id>org.strawbs.strawberry</id>
-  <launchable type="desktop-id">org.strawbs.strawberry.desktop</launchable>
+  <id>org.strawberrymusicplayer.strawberry</id>
+  <launchable type="desktop-id">org.strawberrymusicplayer.strawberry.desktop</launchable>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0+</project_license>
   <provides>
@@ -10,7 +10,7 @@
   </provides>
   <name>Strawberry Music Player</name>
   <summary>A music player and collection organizer</summary>
-  <url type="homepage">https://www.strawbs.org/</url>
+  <url type="homepage">https://www.strawberrymusicplayer.org/</url>
   <url type="bugtracker">https://github.com/jonaski/strawberry/</url>
   ​<translation type="qt">strawberry</translation>
   <description>
@@ -41,11 +41,11 @@
   <screenshots>
     <screenshot type="default">
       <caption>Song playing showing context</caption>
-      <image width="1600" height="874">https://www.strawbs.org/pictures/appdata-screenshot-001.png</image>
+      <image width="1600" height="874">https://www.strawberrymusicplayer.org/pictures/appdata-screenshot-001.png</image>
     </screenshot>
     <screenshot>
       <caption>Collection overview</caption>
-      <image width="1600" height="874">https://www.strawbs.org/pictures/appdata-screenshot-002.png</image>
+      <image width="1600" height="874">https://www.strawberrymusicplayer.org/pictures/appdata-screenshot-002.png</image>
     </screenshot>
   </screenshots>
   <update_contact>eclipseo@fedoraproject.org</update_contact>
diff --git a/dist/unix/org.strawbs.strawberry.desktop b/dist/unix/org.strawberrymusicplayer.strawberry.desktop
similarity index 100%
rename from dist/unix/org.strawbs.strawberry.desktop
rename to dist/unix/org.strawberrymusicplayer.strawberry.desktop
diff --git a/dist/windows/strawberry.nsi.in b/dist/windows/strawberry.nsi.in
index af32087a7..a82d82d02 100644
--- a/dist/windows/strawberry.nsi.in
+++ b/dist/windows/strawberry.nsi.in
@@ -47,7 +47,7 @@
 !define PRODUCT_DISPLAY_VERSION_SHORT "@STRAWBERRY_VERSION_PACKAGE@"
 
 !define PRODUCT_PUBLISHER "Jonas Kvinge"
-!define PRODUCT_WEB_SITE "http://www.strawbs.org/"
+!define PRODUCT_WEB_SITE "https://www.strawberrymusicplayer.org/"
 
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"
 
diff --git a/ext/gstmoodbar/gstmoodbarplugin.cpp b/ext/gstmoodbar/gstmoodbarplugin.cpp
index 58928bdcf..13dd00ff0 100644
--- a/ext/gstmoodbar/gstmoodbarplugin.cpp
+++ b/ext/gstmoodbar/gstmoodbarplugin.cpp
@@ -46,5 +46,5 @@ int gstfastspectrum_register_static() {
     "GPL",
     "FastSpectrum",
     "FastSpectrum",
-    "https://www.strawbs.org");
+    "https://www.strawberrymusicplayer.org");
 }
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index b569048f8..3968be81d 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -74,8 +74,8 @@ parts:
       cmake ../src -DCMAKE_INSTALL_PREFIX=/usr
       make -j $(getconf _NPROCESSORS_ONLN)
       make DESTDIR=$SNAPCRAFT_PART_INSTALL install
-      sed -i 's|Icon=strawberry|Icon=/usr/share/icons/hicolor/128x128/apps/strawberry\.png|' $SNAPCRAFT_PART_INSTALL/usr/share/applications/org.strawbs.strawberry.desktop
-      sed -i 's|TryExec=.*|TryExec=/snap/bin/strawberry|' $SNAPCRAFT_PART_INSTALL/usr/share/applications/org.strawbs.strawberry.desktop
+      sed -i 's|Icon=strawberry|Icon=/usr/share/icons/hicolor/128x128/apps/strawberry\.png|' $SNAPCRAFT_PART_INSTALL/usr/share/applications/org.strawberrymusicplayer.strawberry.desktop
+      sed -i 's|TryExec=.*|TryExec=/snap/bin/strawberry|' $SNAPCRAFT_PART_INSTALL/usr/share/applications/org.strawberrymusicplayer.strawberry.desktop
 
     build-packages:
       - cmake
@@ -166,7 +166,7 @@ parts:
 apps:
   strawberry:
     command: desktop-launch $SNAP/usr/bin/strawberry
-    desktop: usr/share/applications/org.strawbs.strawberry.desktop
+    desktop: usr/share/applications/org.strawberrymusicplayer.strawberry.desktop
     environment:
       ALSA_CONFIG_PATH: /snap/$SNAPCRAFT_PROJECT_NAME/current/usr/share/alsa/alsa.conf
       LD_LIBRARY_PATH: $LD_LIBRARY_PATH:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/pulseaudio
diff --git a/src/core/mpris2.cpp b/src/core/mpris2.cpp
index 0901e2d67..510d3d694 100644
--- a/src/core/mpris2.cpp
+++ b/src/core/mpris2.cpp
@@ -370,7 +370,7 @@ void Mpris2::SetShuffle(bool enable) {
 QVariantMap Mpris2::Metadata() const { return last_metadata_; }
 
 QString Mpris2::current_track_id() const {
-  return QString("/org/strawbs/strawberry/Track/%1").arg(QString::number(app_->playlist_manager()->active()->current_row()));
+  return QString("/org/strawberrymusicplayer/strawberry/Track/%1").arg(QString::number(app_->playlist_manager()->active()->current_row()));
 }
 
 // We send Metadata change notification as soon as the process of changing song starts...
@@ -541,7 +541,7 @@ QStringList Mpris2::Orderings() const { return QStringList() << "User"; }
 namespace {
 
 QDBusObjectPath MakePlaylistPath(int id) {
-  return QDBusObjectPath(QString("/org/strawbs/strawberry/PlaylistId/%1").arg(id));
+  return QDBusObjectPath(QString("/org/strawberrymusicplayer/strawberry/PlaylistId/%1").arg(id));
 }
 
 }
diff --git a/src/main.cpp b/src/main.cpp
index 590f4b793..4adfb4c52 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -118,7 +118,7 @@ int main(int argc, char* argv[]) {
   QCoreApplication::setOrganizationName("strawberry");
 #endif
   QCoreApplication::setApplicationVersion(STRAWBERRY_VERSION_DISPLAY);
-  QCoreApplication::setOrganizationDomain("strawbs.org");
+  QCoreApplication::setOrganizationDomain("strawberrymusicplayer.org");
 
 // This makes us show up nicely in gnome-volume-control
 #if !GLIB_CHECK_VERSION(2, 36, 0) // Deprecated in glib 2.36.0
diff --git a/src/scrobbler/scrobblingapi20.cpp b/src/scrobbler/scrobblingapi20.cpp
index 1083154f3..037bb5efd 100644
--- a/src/scrobbler/scrobblingapi20.cpp
+++ b/src/scrobbler/scrobblingapi20.cpp
@@ -61,7 +61,7 @@
 
 const char *ScrobblingAPI20::kApiKey = "211990b4c96782c05d1536e7219eb56e";
 const char *ScrobblingAPI20::kSecret = "80fd738f49596e9709b1bf9319c444a8";
-const char *ScrobblingAPI20::kRedirectUrl = "https://oauth.strawbs.net";
+const char *ScrobblingAPI20::kRedirectUrl = "https://oauth.strawberrymusicplayer.org";
 const int ScrobblingAPI20::kScrobblesPerRequest = 50;
 
 ScrobblingAPI20::ScrobblingAPI20(const QString &name, const QString &settings_group, const QString &auth_url, const QString &api_url, const bool batch, Application *app, QObject *parent) :
