diff --git a/.gitignore b/.gitignore
index 27220cab0..ceb600918 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,8 +13,8 @@ index.html
 .project
 .settings
 .sass-cache
-_site
 node_modules
+/docs
 /videos
 /web
 c64/
diff --git a/README.md b/README.md
index f3aa6b64c..ba31be258 100644
--- a/README.md
+++ b/README.md
@@ -170,7 +170,7 @@ Now open a web browser and go to `http://localhost:4000/`.  You're done!
 Some useful Jekyll server options include:
 
 	bundle exec jekyll serve --host=0.0.0.0 --config _config.yml,_developer.yml
-	
+
 The *--host* option makes it possible to access the web server from other devices on your local network;
 for example, you may want to run PCjs on your iPhone, iPad, or other wireless device.  And by adding **_developer.yml**,
 you can override the Jekyll configuration defaults in **_config.yml**.  Using development (non-production) settings in
diff --git a/_config.yml b/_config.yml
index 77678a7b3..313af44ab 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,5 +1,7 @@
 # Site settings
 
+source: .
+destination: ./docs
 title: "PCjs Machines"
 email: Jeff@pcjs.org
 description: >
@@ -8,8 +10,8 @@ description: >
   (up through the 80386), C1Pjs for the 6502-based Ohio Scientific Challenger 1P, PC8080 for 8080-based machines
   such as Space Invaders and the DEC VT100 Terminal, and PDPjs with support for PDP-10 and PDP-11 machines.
   PCjs also provides an archive of selected historical PC software, publications, and reference materials.
-baseurl: "/pcjs"                 # "/pcjs" when using http://jeffpar.github.io or "" when using http://www.pcjs.org
-url: "http://jeffpar.github.io"  # "http://jeffpar.github.io" or "http://www.pcjs.org"
+baseurl: ""
+url: "http://www.pcjs.org"
 twitter_username: jeffpar
 github_username:  jeffpar
 
@@ -19,7 +21,7 @@ encoding: UTF-8
 
 # Build settings
 
-exclude: ["index.html", "**/index.html", "bin", "logs", "node_modules", "projects", "src", "tmp", "videos", "web", "**/archive", "**/ecp", "**/c64", "**/private", "**/restricted", "**/src", "**/tmp", "**/unlisted", ".git", ".idea"]
+exclude: ["index.html", "**/index.html", "bin", "logs", "node_modules", "projects", "src", "tmp", "videos", "web", "**/archive", "**/ecp", "**/c64", "**/private", "**/restricted", "**/src", "**/tmp", "**/unlisted", ".git", ".idea", "/Gemfile", "/Gemfile.lock", "/Gruntfile.js", "/gulpfile.js", "/notes.md", "/server.js", "/*.sh"]
 markdown: kramdown
 kramdown:
   input: GFM