diff --git a/README.md b/README.md
index c6082a2f5..34dffae4c 100644
--- a/README.md
+++ b/README.md
@@ -32,13 +32,13 @@ Demos
 Some pre-configured machines are shown below, ready to run BASIC, DOS, Windows 1.01, and assorted non-DOS software.
 
 [<img src="/devices/pc/machine/5150/cga/64kb/donkey/thumbnail.jpg" width="200" height="100"/>](/devices/pc/machine/5150/cga/64kb/donkey/ "IBM PC running DONKEY.BAS")
-[<img src="{{ site.baseurl }}/devices/pc/machine/5160/cga/256kb/demo/thumbnail.jpg" width="200" height="100"/>]({{ site.baseurl }}/devices/pc/machine/5160/cga/256kb/demo/ "IBM PC XT w/CGA, 10Mb Hard Drive")
-[<img src="{{ site.baseurl }}/devices/pc/machine/5160/cga/256kb/win101/thumbnail.jpg" width="200" height="100"/>]({{ site.baseurl }}/devices/pc/machine/5160/cga/256kb/win101/ "IBM PC XT w/CGA, Windows 1.01")
-[<img src="{{ site.baseurl }}/devices/pc/machine/5160/ega/640kb/win101/thumbnail.jpg" width="200" height="100"/>]({{ site.baseurl }}/devices/pc/machine/5160/ega/640kb/win101/ "IBM PC XT w/EGA, Windows 1.01")
-[<img src="{{ site.baseurl }}/disks/pc/os2/ibm/1.0/thumbnail.jpg" width="200" height="100"/>]({{ site.baseurl }}/disks/pc/os2/ibm/1.0/ "IBM PC AT w/EGA, OS/2 1.0")
-[<img src="{{ site.baseurl }}/disks/pc/cpm/thumbnail.jpg" width="200" height="100"/>]({{ site.baseurl }}/disks/pc/cpm/ "IBM PC w/MDA, CP/M-86")
-[<img src="{{ site.baseurl }}/disks/pc/games/microsoft/adventure/thumbnail.jpg" width="200" height="100"/>]({{ site.baseurl }}/disks/pc/games/microsoft/adventure/ "IBM PC w/MDA, Microsoft Adventure")
-[<img src="{{ site.baseurl }}/disks/pc/games/infocom/zork1/thumbnail.jpg" width="200" height="100"/>]({{ site.baseurl }}/disks/pc/games/infocom/zork1/ "IBM PC w/CGA, Zork I")
+[<img src="/devices/pc/machine/5160/cga/256kb/demo/thumbnail.jpg" width="200" height="100"/>](/devices/pc/machine/5160/cga/256kb/demo/ "IBM PC XT w/CGA, 10Mb Hard Drive")
+[<img src="/devices/pc/machine/5160/cga/256kb/win101/thumbnail.jpg" width="200" height="100"/>](/devices/pc/machine/5160/cga/256kb/win101/ "IBM PC XT w/CGA, Windows 1.01")
+[<img src="/devices/pc/machine/5160/ega/640kb/win101/thumbnail.jpg" width="200" height="100"/>](/devices/pc/machine/5160/ega/640kb/win101/ "IBM PC XT w/EGA, Windows 1.01")
+[<img src="/disks/pc/os2/ibm/1.0/thumbnail.jpg" width="200" height="100"/>](/disks/pc/os2/ibm/1.0/ "IBM PC AT w/EGA, OS/2 1.0")
+[<img src="/disks/pc/cpm/thumbnail.jpg" width="200" height="100"/>](/disks/pc/cpm/ "IBM PC w/MDA, CP/M-86")
+[<img src="/disks/pc/games/microsoft/adventure/thumbnail.jpg" width="200" height="100"/>](/disks/pc/games/microsoft/adventure/ "IBM PC w/MDA, Microsoft Adventure")
+[<img src="/disks/pc/games/infocom/zork1/thumbnail.jpg" width="200" height="100"/>](/disks/pc/games/infocom/zork1/ "IBM PC w/CGA, Zork I")
 
 Check out the rest of the PCjs [Application](/apps/pc/), [Boot Disk](/disks/pc/) and [Machine](/devices/pc/machine/)
 demos, including an [IBM PC Dual Display System](/devices/pc/machine/5150/dual/64kb/) demo of multiple monitor support,
diff --git a/_config.yml b/_config.yml
index 573b734f6..c4ba6e089 100644
--- a/_config.yml
+++ b/_config.yml
@@ -5,8 +5,8 @@ description: > # this means to ignore newlines until "baseurl:"
   Write an awesome description for your new site here. You can edit this
   line in _config.yml. It will appear in your document head meta (for
   Google search results) and in your feed.xml site description.
-baseurl: "/pcjs" # the subpath of your site, e.g. /blog/
-url: "http://jeffpar.github.io" # the base hostname & protocol for your site
+baseurl: "/" # the subpath of your site, e.g. /blog/
+url: "http://pcjs.net" # the base hostname & protocol for your site
 twitter_username: jeffpar
 github_username:  jeffpar