diff --git a/WebModules.cpp b/WebModules.cpp
index 5c9d5fdc..91183736 100644
--- a/WebModules.cpp
+++ b/WebModules.cpp
@@ -535,6 +535,8 @@ CWebSock::EPageReqResult CWebSock::OnPageRequestInternal(const CString& sURI, CS
 		return PrintTemplate("index", sPageRet);
 	} else if (sURI == "/favicon.ico") {
 		return PrintStaticFile("/pub/favicon.ico", sPageRet);
+	} else if (sURI == "/robots.txt") {
+		return PrintStaticFile("/pub/robots.txt", sPageRet);
 	} else if (sURI == "/logout") {
 		m_spSession->SetLoggedIn(false);
 		SetLoggedIn(false);
diff --git a/webskins/_default_/pub/robots.txt b/webskins/_default_/pub/robots.txt
new file mode 100644
index 00000000..1f53798b
--- /dev/null
+++ b/webskins/_default_/pub/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /