diff --git a/certbot-compatibility-test/Dockerfile b/certbot-compatibility-test/Dockerfile
index c32bc0bd6..a9996f779 100644
--- a/certbot-compatibility-test/Dockerfile
+++ b/certbot-compatibility-test/Dockerfile
@@ -14,7 +14,7 @@ RUN /opt/certbot/src/letsencrypt-auto-source/letsencrypt-auto --os-packages-only
 # the above is not likely to change, so by putting it further up the
 # Dockerfile we make sure we cache as much as possible
 
-COPY certbot/setup.py certbot/README.rst CHANGELOG.md certbot/MANIFEST.in linter_plugin.py tox.cover.py tox.ini .pylintrc /opt/certbot/src/
+COPY certbot/setup.py certbot/README.rst certbot/CHANGELOG.md certbot/MANIFEST.in linter_plugin.py tox.cover.py tox.ini .pylintrc /opt/certbot/src/
 
 # all above files are necessary for setup.py, however, package source
 # code directory has to be copied separately to a subdirectory...
diff --git a/certbot/README.rst b/certbot/README.rst
index 5f5ea17a1..2c934ce59 100644
--- a/certbot/README.rst
+++ b/certbot/README.rst
@@ -16,7 +16,7 @@ configuring webservers to use them. This client runs on Unix-based operating
 systems.
 
 To see the changes made to Certbot between versions please refer to our
-`changelog <https://github.com/certbot/certbot/blob/master/CHANGELOG.md>`_.
+`changelog <https://github.com/certbot/certbot/blob/master/certbot/CHANGELOG.md>`_.
 
 Until May 2016, Certbot was named simply ``letsencrypt`` or ``letsencrypt-auto``,
 depending on install method. Instructions on the Internet, and some pieces of the
diff --git a/tools/extract_changelog.py b/tools/extract_changelog.py
index d3bd2aa44..695870278 100755
--- a/tools/extract_changelog.py
+++ b/tools/extract_changelog.py
@@ -16,7 +16,7 @@ def main():
     section_pattern = re.compile(r'^##\s*{0}\s*-\s*[\d-]+$'
                                  .format(version.replace('.', '\\.')))
 
-    with open(os.path.join(CERTBOT_ROOT, 'CHANGELOG.md')) as file_h:
+    with open(os.path.join(CERTBOT_ROOT, 'certbot', 'CHANGELOG.md')) as file_h:
         lines = file_h.read().splitlines()
 
     changelog = []