diff --git a/docs/source/changelog.md b/docs/source/changelog.md
index 4cd14dbd..5a5b6112 100644
--- a/docs/source/changelog.md
+++ b/docs/source/changelog.md
@@ -283,7 +283,7 @@ and tornado < 5.0.
   coroutines, and CPU/memory/FD consumption.
 - Add async `Spawner.get_options_form` alternative to `.options_form`, so it can be a coroutine.
 - Add `JupyterHub.redirect_to_server` config to govern whether
-  users should be sent to their server on login or the JuptyerHub home page.
+  users should be sent to their server on login or the JupyterHub home page.
 - html page templates can be more easily customized and extended.
 - Allow registering external OAuth clients for using the Hub as an OAuth provider.
 - Add basic prometheus metrics at `/hub/metrics` endpoint.
diff --git a/onbuild/Dockerfile b/onbuild/Dockerfile
index ad941aac..1e1bf8f4 100644
--- a/onbuild/Dockerfile
+++ b/onbuild/Dockerfile
@@ -1,6 +1,6 @@
 # JupyterHub Dockerfile that loads your jupyterhub_config.py
 #
-# Adds ONBUILD step to jupyter/jupyterhub to load your juptyerhub_config.py into the image
+# Adds ONBUILD step to jupyter/jupyterhub to load your jupyterhub_config.py into the image
 #
 # Derivative images must have jupyterhub_config.py next to the Dockerfile.
 
diff --git a/onbuild/README.md b/onbuild/README.md
index 8964110d..fae5e4fb 100644
--- a/onbuild/README.md
+++ b/onbuild/README.md
@@ -2,7 +2,7 @@
 
 If you base a Dockerfile on this image:
 
-    FROM juptyerhub/jupyterhub-onbuild:0.6
+    FROM jupyterhub/jupyterhub-onbuild:0.6
     ...
 
 then your `jupyterhub_config.py` adjacent to your Dockerfile will be loaded into the image and used by JupyterHub.