diff --git a/CNAME b/CNAME
new file mode 100644
index 000000000..20a261877
--- /dev/null
+++ b/CNAME
@@ -0,0 +1 @@
+https://mremoteng.org
\ No newline at end of file
diff --git a/_config.yaml b/_config.yaml
index 230c626f1..4f13c2b82 100644
--- a/_config.yaml
+++ b/_config.yaml
@@ -1,7 +1,7 @@
 name: mRemoteNG
 description: The next generation of mRemote, open source, tabbed, multi-protocol, remote connections manager.
-url: https://mRemoteNG.github.io
-baseurl: /mRemoteNG
+url: https://mremoteng.org
+baseurl: 
 repository: mRemoteNG/mRemoteNG
 exclude: [README.md, Gemfile, Gemfile.lock]
 permalink: pretty