diff --git a/README.md b/README.md
index 362efd42..76528ac9 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,8 @@ Note: If you are using a Jekyll version less than 3.5.0, use the `gems` key inst
     description: YOUR DESCRIPTION
     theme: just-the-docs
 
-    url: https://YOUR-USERNAME.github.io/YOUR-SITE-NAME
+    url: https://YOUR-USERNAME.github.io
+    baseurl: YOUR-SITE-NAME # baseurl is used by Jekyll when serving from a subfolder
 
     aux_links: # remove if you don't want this link to appear on your pages
       Template Repository: https://github.com/YOUR-USERNAME/YOUR-SITE-NAME
diff --git a/_config.yml b/_config.yml
index faa6eaa8..82a10e42 100644
--- a/_config.yml
+++ b/_config.yml
@@ -3,6 +3,7 @@ description: A starter template for a Jeykll site using the Just the Docs theme!
 theme: just-the-docs
 
 url: https://just-the-docs.github.io
+baseurl: ''
 
 aux_links:
   Template Repository: https://github.com/just-the-docs/just-the-docs-template