diff --git a/doc/TESTS.md b/doc/TESTS.md
index adf5c5f72..7d04f7086 100644
--- a/doc/TESTS.md
+++ b/doc/TESTS.md
@@ -99,7 +99,7 @@ About testing in the hledger project, as of 201809.
     [examples](https://github.com/simonmichael/hledger/blob/master/hledger-lib/Hledger/Read/JournalReader.hs#L579).
 
     The unit tests are shipped as part of the hledger executable, and
-    can always be run via the [test](https://hledger.org/manual#test)
+    can always be run via the [test](https://hledger.org/hledger.html#test)
     command (`hledger test`).
 
     Here\'s the quick way to run unit tests while developing:\
diff --git a/hledger-lib/Hledger/Read/CsvReader.hs b/hledger-lib/Hledger/Read/CsvReader.hs
index 3e3014535..d147684bc 100644
--- a/hledger-lib/Hledger/Read/CsvReader.hs
+++ b/hledger-lib/Hledger/Read/CsvReader.hs
@@ -134,7 +134,7 @@ csvFileFor = reverse . drop 6 . reverse
 defaultRulesText :: FilePath -> Text
 defaultRulesText csvfile = T.pack $ unlines
   ["# hledger csv conversion rules for " ++ csvFileFor (takeFileName csvfile)
-  ,"# cf http://hledger.org/manual#csv-files"
+  ,"# cf http://hledger.org/hledger.html#csv"
   ,""
   ,"account1 assets:bank:checking"
   ,""
diff --git a/hledger-lib/Hledger/Read/JournalReader.hs b/hledger-lib/Hledger/Read/JournalReader.hs
index a6718d1b9..abb951033 100644
--- a/hledger-lib/Hledger/Read/JournalReader.hs
+++ b/hledger-lib/Hledger/Read/JournalReader.hs
@@ -4,7 +4,7 @@
 {-|
 
 A reader for hledger's journal file format
-(<http://hledger.org/MANUAL.html#the-journal-file>).  hledger's journal
+(<http://hledger.org/hledger.html#the-journal-file>).  hledger's journal
 format is a compatible subset of c++ ledger's
 (<http://ledger-cli.org/3.0/doc/ledger3.html#Journal-Format>), so this
 reader should handle many ledger files as well. Example:
@@ -226,7 +226,7 @@ addJournalItemP =
 --- *** directives
 
 -- | Parse any journal directive and update the parse state accordingly.
--- Cf http://hledger.org/manual.html#directives,
+-- Cf http://hledger.org/hledger.html#directives,
 -- http://ledger-cli.org/3.0/doc/ledger3.html#Command-Directives
 directivep :: MonadIO m => ErroringJournalParser m ()
 directivep = (do
diff --git a/hledger-web/Hledger/Web/Settings.hs b/hledger-web/Hledger/Web/Settings.hs
index 579d41f6e..7d9666c69 100644
--- a/hledger-web/Hledger/Web/Settings.hs
+++ b/hledger-web/Hledger/Web/Settings.hs
@@ -34,7 +34,7 @@ hledgerorgurl :: Text
 hledgerorgurl = "http://hledger.org"
 
 manualurl :: Text
-manualurl = hledgerorgurl <> "/manual"
+manualurl = hledgerorgurl <> "hledger.html"
 
 -- | The default IP address to listen on. May be overridden with --host.
 defhost :: String
diff --git a/hledger/Hledger/Cli/Commands/Balance.md b/hledger/Hledger/Cli/Commands/Balance.md
index 8acd49bc0..8a8f428ad 100644
--- a/hledger/Hledger/Cli/Commands/Balance.md
+++ b/hledger/Hledger/Cli/Commands/Balance.md
@@ -605,7 +605,7 @@ Also:
 ### Budget report
 
 The `--budget` report type activates extra columns showing any budget goals for each account and period.
-The budget goals are defined by [periodic transactions](journal.html#periodic-transactions).
+The budget goals are defined by [periodic transactions](hledger.html#periodic-transactions).
 This is very useful for comparing planned and actual income, expenses, time usage, etc.
 
 For example, you can take average monthly expenses in the common expense categories to construct a minimal monthly budget: