diff --git a/Getting-Started-with-MMGen.md b/Getting-Started-with-MMGen.md
index 0b097d4..7b23c3d 100644
--- a/Getting-Started-with-MMGen.md
+++ b/Getting-Started-with-MMGen.md
@@ -43,6 +43,11 @@ place.
 The up arrow (for repeating commands) and tab key (or Ctrl-I) (for completing
 commands and filenames) will speed up your work at the command line greatly.
 
+The examples in this tutorial are geared towards Bitcoin, but with some
+modification they may be used with altcoins and forkcoins for which MMGen
+supports transaction operations (BCH, LTC, ETH and ETC as of this writing).
+See [Altcoin-and-Forkcoin-Support][09] for more details.
+
 #### <a name='a_iv'>Invocation</a>
 
 The MMGen wallet system is not a single program but a suite of lightweight
@@ -261,10 +266,20 @@ Save the file, copy it onto a USB stick and transfer it to your online computer.
 
 #### <a name='a_ia'>Import addresses (online computer)</a>
 
-On your online computer, go to your bitcoind data directory and move any
-existing `wallet.dat` file out of harm’s way.  Start bitcoind and let it
-generate a new `wallet.dat`; this you’ll use as your tracking wallet.  Import
-your ten addresses into the new tracking wallet with the command:
+On your online computer, go to your coin daemon’s data directory (`~/.bitcoin`
+by default for Bitcoin Core) and move any existing `wallet.dat` file out of
+harm’s way.  With more recent coin daemons, `wallet.dat` can be found in the
+`wallets` subdirectory of the daemon data directory.
+
+Start the coin daemon with the required options (see the [Install-Bitcoind][08]
+wiki page for more details on invoking the daemon for your coin and platform).
+
+Upon startup, older daemons will automatically generate a new default
+`wallet.dat`, which MMGen will use as its tracking wallet.  With newer daemons
+(e.g. Core 0.21.0 and above), the tracking wallet will be a directory named
+`mmgen-tracking-wallet` located by default in the `wallets` subdirectory.
+
+Import your ten addresses into the new tracking wallet with the command:
 
 	$ mmgen-addrimport --batch my.addrs
 
@@ -963,5 +978,7 @@ features or requirements.  Now perform the install:
 [05]: Key-address-files
 [06]: Subwallets
 [07]: autosign-[MMGen-command-help]
+[08]: Install-Bitcoind
+[09]: Altcoin-and-Forkcoin-Support
 [hc]: https://github.com/mmgen/mmgen/commits/master
 [lc]: https://gitlab.com/mmgen/mmgen/commits/master
diff --git a/Test-Suite.md b/Test-Suite.md
index a8b94d2..b4caea0 100644
--- a/Test-Suite.md
+++ b/Test-Suite.md
@@ -28,6 +28,11 @@ Point the test suite to your copy of the Bitcoin Core repo:
 
 	$ export CORE_REPO_ROOT=/path/to/bitcoin/core/repo
 
+CD to the MMGen repository root and build without installing:
+
+	$ cd path/to/mmgen/repo
+	$ python3 setup.py build
+
 Run the test suite, skipping altcoin tests:
 
 	$ test/test-release.sh -F noalt