diff --git a/pubs/README.md b/pubs/README.md
index 30871b626..a91a19632 100644
--- a/pubs/README.md
+++ b/pubs/README.md
@@ -13,39 +13,40 @@ Documentation and Publication Archive
 
 Preliminary documentation is available for the following PCjs machines:
 
-* [C1Pjs](/pubs/c1pjs/)
-* [PCx86](/pubs/pcx86/)
+* [C1Pjs](c1pjs/)
+* [PCx86](pcx86/)
 
-For general historical interest, the project includes a [Publication Archive](/pubs/) that covers:
+For general historical interest, the project includes a Publication Archive that covers:
 
-* [IBM PCs and Compatibles](/pubs/pc/)
-	* [CPU Documents](/pubs/pc/reference/intel/)
-	* [Datasheets](/pubs/pc/datasheets/)
-	* [Magazines](/pubs/pc/magazines/)
-	* [Programming Guides](/pubs/pc/programming/)
-	* [Reference Manuals](/pubs/pc/reference/)
-	* [Software User and Development Guides](/pubs/pc/software/) (eg, [DOS](/pubs/pc/software/dos/), [OS/2](/pubs/pc/software/os2/), [Windows](/pubs/pc/software/windows/))
-* [Digital Equipment Corporation (DEC)](/pubs/dec/)
-	* [PDP-11](/pubs/dec/pdp11/)
-	* [VT100](/pubs/dec/vt100/)
-* [Ohio Scientific's 6502-based Challenger 1P](/pubs/c1p/)
-	* [Datasheets](/pubs/c1p/datasheets/)
-	* [Programming Guides/Samples](/pubs/c1p/programming/)
-	* [Reference Manuals](/pubs/c1p/techref/)
+* [IBM PCs and Compatibles](pc/)
+	* [CPU Documents](pc/reference/intel/)
+	* [Datasheets](pc/datasheets/)
+	* [Magazines](pc/magazines/)
+	* [Programming Guides](pc/programming/)
+	* [Reference Manuals](pc/reference/)
+	* [Software User and Development Guides](pc/software/) (eg, [DOS](pc/software/dos/), [OS/2](pc/software/os2/), [Windows](pc/software/windows/))
+* [Digital Equipment Corporation (DEC)](dec/)
+	* [PDP-10](dec/pdp10/)
+	* [PDP-11](dec/pdp11/)
+	* [VT100](dec/vt100/)
+* [Ohio Scientific's 6502-based Challenger 1P](c1p/)
+	* [Datasheets](c1p/datasheets/)
+	* [Programming Guides/Samples](c1p/programming/)
+	* [Reference Manuals](c1p/techref/)
 
 {% if site.developer %}
 
 Eventually, the project may also provide summaries of all supported CPU instructions; e.g.:
 
-* [x86 Instructions](/pubs/x86/)
-* [6502 Instructions](/pubs/6502/)
+* [x86 Instructions](x86/)
+* [6502 Instructions](6502/)
 
 {% endif %}
 
-Finally, here's an eclectic collection of personal documents, ranging from early PC debugging notes to old program
+Finally, we have an eclectic collection of personal documents, ranging from early PC debugging notes to old program
 listings and more:
 
-* [Personal Documents of Dubious Historical Interest](/pubs/personal/)
+* [Personal Documents of Dubious Historical Interest](personal/)
 
 ---
 
diff --git a/pubs/about/README.md b/pubs/about/README.md
index 42c5f04cd..13e83c104 100644
--- a/pubs/about/README.md
+++ b/pubs/about/README.md
@@ -45,8 +45,8 @@ Read [About PCx86](/pubs/about/pcx86/) to learn more about its history, features
 ### Migrating to Node
 
 The PCjs web server was originally written in PHP and hosted by [DreamHost](https://www.dreamhost.com/) as
-[jsmachines.net](http://jsmachines.net/), but in 2014, it was migrated to a [Node.js](http://nodejs.org) web server
-and hosted by [Amazon Web Services](https://aws.amazon.com/elasticbeanstalk/) as [pcjs.org](http://www.pcjs.org/).
+[jsmachines.net](http://jsmachines.net/), but in 2014, it was migrated to a [Node.js](http://nodejs.org) web server and
+hosted by [Amazon Web Services](https://aws.amazon.com/elasticbeanstalk/) as [{{ site.pcjs.domain }}]({{ site.url }}/).
 
 The goals included:
 
@@ -61,15 +61,16 @@ including extensions to the link syntax that make it easy to embed PCjs machines
 
 ### Migrating to GitHub Pages
 
-To simplify hosting requirements, the PCjs Project was migrated to [GitHub Pages](https://pages.github.com/) in late 2015.
-The project still includes the original Node-based web server, which is useful for development and debugging, but for
-production sites (including [pcjs.org](http://www.pcjs.org/)), using Jekyll to generate a static copy of the project for
-the web is the preferred solution.
+To simplify hosting requirements, the PCjs Project was migrated to [GitHub Pages](https://pages.github.com/) in late
+2015.  The project still includes the original Node-based web server, which is useful for development and debugging,
+but for production sites (including [{{ site.pcjs.domain }}]({{ site.url }}/)), using Jekyll to generate a static copy
+of the project for the web is the preferred solution.
 
 ---
 
 License
----
+-------
+
 The [PCjs Project](https://github.com/jeffpar/pcjs) is now an open-source project on [GitHub](http://github.com/).
 All published portions are free for redistribution and/or modification under the terms of the
 [GNU General Public License](/LICENSE) as published by the Free Software Foundation, either version 3 of the License,
@@ -85,6 +86,7 @@ or computer that runs any version of this software.
 See [LICENSE](/LICENSE) for details.
 
 More Information
----
+----------------
+
 If you have questions or run into any problems, feel free to [tweet](http://twitter.com/jeffpar) or
 [email](mailto:Jeff@pcjs.org).