diff --git a/doc/404.rst b/doc/404.rst
new file mode 100644
index 000000000..82120fed1
--- /dev/null
+++ b/doc/404.rst
@@ -0,0 +1,24 @@
+:orphan:
+
+.. _page-not-found:
+
+Sorry, Page Not Found
+#####################
+
+.. image:: images/ACRN-fall-from-tree-small.png
+   :align: left
+   :scale: 50%
+
+|
+| Sorry, the page you requested was not found on this site.
+|
+|
+| Please check the address for misspellings.
+| It's also possible we've removed or renamed the page you're looking for.
+|
+| Please try using the navigation links on the left of this page to navigate
+| the major sections of our site, or use the document search box.
+
+.. raw:: html
+
+   <div style='clear:both'></div>
diff --git a/doc/Makefile b/doc/Makefile
index f2b6e8fec..174270a80 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -85,6 +85,9 @@ publish:
 	cp scripts/publish-README.md $(PUBLISHDIR)/../README.md
 	cp scripts/publish-index.html $(PUBLISHDIR)/../index.html
 	cp scripts/publish-robots.txt $(PUBLISHDIR)/../robots.txt
+	ifeq ($(RELEASE),latest)
+	  cp _build/html/404.html $(PUBLISHDIR)/../404.html
+	endif
 	cd $(PUBLISHDIR)/..; git add -A; git commit -s -m "publish $(RELEASE)"; git push origin master;
 
 
diff --git a/doc/images/ACRN-fall-from-tree-small.png b/doc/images/ACRN-fall-from-tree-small.png
new file mode 100644
index 000000000..b7132b506
Binary files /dev/null and b/doc/images/ACRN-fall-from-tree-small.png differ