diff --git a/octoprint/server.py b/octoprint/server.py
index 0fc08c71..8d2287d7 100644
--- a/octoprint/server.py
+++ b/octoprint/server.py
@@ -174,6 +174,10 @@ def index():
 		gitCommit=commit
 	)
 
+@app.route("/robots.txt")
+def robotsTxt():
+	return send_from_directory(app.static_folder, "robots.txt")
+
 #~~ Printer control
 
 @app.route(BASEURL + "control/connection/options", methods=["GET"])
diff --git a/octoprint/static/robots.txt b/octoprint/static/robots.txt
new file mode 100644
index 00000000..1f53798b
--- /dev/null
+++ b/octoprint/static/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /