diff -uNr a/bitcoin/manifest b/bitcoin/manifest
--- a/bitcoin/manifest 1b686bcb52a6a5df9ee7db45315e32fd9b90ebff8783cde2aec664538b6722a972be2c060c4dc97eb5138f454413a2df670ed361b120bfa43acba686aeb9a54f
+++ b/bitcoin/manifest f6fddd5bbecc5891865dc555caa0d9010976ba1c2e8c2216265d2d1c87dcd0ae2d4a7a2504b0e71e04ab5fe3a1f683042e288ec8f6a5449bada22c833f4043b0
@@ -32,3 +32,5 @@
 616451 mod6_phexdigit_fix mod6 Adds missing comma to separate values in the phexdigit array in util.cpp.
 617254 mod6_excise_hash_truncation mod6 Regrind of ben_vulpes original; Removes truncation of hashes printed to TRB log file
 617255 mod6_whogaveblox mod6 Regrind of asciilifeform original; Record the origin of every incoming candidate block (whether accepted or rejected)
+xxxxxx obey_sendbuffersize Fix for ancient bug in getdata (asciilifeform & mod6, apr. 2020)
+687105 asciilifeform_dumpblocks_force_mainchain Fix for bug where 'dumpblocks' may return an orphaned block
diff -uNr a/bitcoin/src/bitcoinrpc.cpp b/bitcoin/src/bitcoinrpc.cpp
--- a/bitcoin/src/bitcoinrpc.cpp aa281513748dd76b77893f0813d9425dfc7163cb1eca4af74d707fd5371b2ec7e7652c2c7a45a0069ac5c877554ca0ac7ec0504b93f5d7c859b29deed20146c7
+++ b/bitcoin/src/bitcoinrpc.cpp 00d5cbce0f72f464ec6b523a4523637a8f66676e105994c5374a5f564a5303ba5db8ac22eda4d90be05e1ccf108510a1ee084f099378ad88732bd627776621b3
@@ -1806,7 +1806,7 @@
     for (map<uint256, CBlockIndex*>::iterator mi = mapBlockIndex.begin(); mi != mapBlockIndex.end(); ++mi)
     {
         CBlockIndex *pindex = (*mi).second;
-	if (pindex->nHeight == want_height) {
+	if ((pindex->nHeight == want_height) && pindex->IsInMainChain()) {
 	    CBlock block;
 	    block.ReadFromDisk(pindex);
 	    printf("Dumping block %d to %s\n", want_height, filename.c_str());