diff --git a/Makefile b/Makefile
index 0be5e6bc..c62cf587 100644
--- a/Makefile
+++ b/Makefile
@@ -10,8 +10,5 @@ clean-pyc:
 	find . -name '*.pyo' -exec rm -f {} +
 	find . -name '*~' -exec rm -f {} +
 
-upload-website:
-	scp -r website/* pocoo.org:/var/www/flask.pocoo.org/
-
 upload-docs:
 	$(MAKE) -C docs dirhtml && scp -r docs/_build/dirhtml/* pocoo.org:/var/www/flask.pocoo.org/docs/
diff --git a/website/404.html b/website/404.html
deleted file mode 100644
index c4de489d..00000000
--- a/website/404.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!doctype html>
-<title>Chapter 404: The Lost Page</title>
-<style type=text/css>
-body, html {
-  height: 100%;
-  margin: 0;
-  padding: 0;
-}
-
-body {
-  background: url(/ship.png) no-repeat center right;
-}
-
-body:after {
-  content: "";
-  display: block;
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  width: 30px;
-  background: url(/mask.png) repeat-y left;
-}
-
-a { color: #004B6B; }
-a:hover { color: #6D4100; }
-
-h1 {
-  font-family: 'Garamond', 'Georgia', serif;
-  font-weight: normal;
-  color: #222;
-  font-size: 40px;
-  padding: 50px 0 10px 50px;
-  margin: 0;
-}
-
-p {
-  font-family: 'Georgia', serif;
-  color: #000;
-  font-size: 20px;
-  padding: 10px 0 0 90px;
-  margin: 0;
-  width: 360px;
-}
-</style>
-<h1>Chapter 404: The Lost Page</h1>
-<p>A careful and diligent search has been made for the desired page, but it just cannot be found.
-<p>And so they returned to <a href=/>familiar waters</a>.
diff --git a/website/index.html b/website/index.html
deleted file mode 100644
index 5db6b850..00000000
--- a/website/index.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<!doctype html>
-<title>Flask (A Python Microframework)</title>
-<meta charset=utf-8>
-<style type=text/css>
-  body    { font-family: 'Georgia', serif; font-size: 17px; color: #000; }
-  a       { color: #004B6B; }
-  a:hover { color: #6D4100; }
-  .box    { width: 540px; margin: 40px auto; }
-  h1, h2  { font-family: 'Garamond', 'Georgia', serif; font-weight: normal; }
-  h1      { margin: 0 0 30px 0; background: url(logo.png) no-repeat center; height: 165px; }
-  h2      { font-size: 28px; margin: 15px 0 5px 0; }
-  code,
-  pre     { font-family: 'Consolas', 'Menlo', 'Deja Vu Sans Mono', 'Bitstream Vera Sans Mono',
-          monospace; font-size: 15px; background: #eee; }
-  pre     { padding: 7px 30px; margin: 15px -30px; line-height: 1.3; }
-  .ig     { color: #888; }
-  p       { line-height: 1.4; }
-  ul      { margin: 15px 0 15px 0; padding: 0; list-style: none; }
-  ul li:before { content: "\00BB \0020"; color: #888; position: absolute; margin-left: -19px; }
-  h1 span, p.tagline { display: none; }
-  blockquote { margin: 0; font-style: italic; color: #444; }
-  .footer { font-size: 13px; color: #888; text-align: right; margin-top: 25px; }
-</style>
-<div class=box>
-  <h1><span>Flask</span></h1>
-  <p class=tagline>because sometimes a pocket knife is not enough
-  <blockquote>
-    Flask is a microframework for Python based on Werkzeug, Jinja 2 and good intentions.
-    And before you ask: It's <a href=docs/license/>BSD licensed</a>!
-  </blockquote>
-  <h2>Flask is Fun</h2>
-  <pre><span class=ig>from flask import Flask
-app = Flask(__name__)</span>
-
-@app.route("/")
-def hello():
-    return "Hello World!"
-
-<span class=ig>if __name__ == "__main__":
-    app.run()</span></pre>
-  <h2>And Easy to Setup</h2>
-  <pre><span class=ig>$ </span>easy_install Flask
-<span class=ig>$ </span>python hello.py
-<span class=ig> * Running on http://localhost:5000/</span></pre>
-  <h2>Interested?</h2>
-  <ul>
-    <li><a href=docs/>Read the documentation</a>
-    <li><a href=http://github.com/mitsuhiko/flask>Fork it on github</a>
-    <li><a href=http://pypi.python.org/pypi/Flask>Download it from PyPI</a>
-  </ul>
-  <h2>What’s in the Box?</h2>
-  <ul>
-    <li>built in development server and <a href=docs/quickstart/#debug-mode>debugger</a>
-    <li>integrated support for <a href=docs/testing/>unittesting support</a>
-    <li>RESTful <a href=docs/quickstart/#routing>request dispatching</a>
-    <li>uses <a href=http://jinja.pocoo.org/2/documentation/templates>Jinja2 templating</a>
-    <li>support for <a href=docs/quickstart/#sessions>secure cookies</a> (client side sessions)
-    <li>100% <a href=http://www.python.org/dev/peps/pep-0333/>WSGI 1.0</a> compliant
-    <li>Unicode based
-  </ul>
-  <h2>What do Flask Apps look like?</h2>
-  <p>
-    If you are looking for some example code of applications written with Flask,
-    have a look at the sources of the examples on github:
-  <ul>
-    <li><a href=http://github.com/mitsuhiko/flask/tree/master/examples/flaskr/>flaskr</a>
-      — a microblog
-    <li><a href=http://github.com/mitsuhiko/flask/tree/master/examples/minitwit/>minitwit</a>
-      — a twitter clone
-  </ul>
-  <h2>Contribute</h2>
-  <p>Found a bug? Have a good idea for improving Flask? Head over to
-    <a href=http://github.com/mitsuhiko/flask>Flask's github</a> page and
-    create a new ticket or fork.  If you just want to chat with fellow
-    developers, go to <code>#pocoo</code> on irc.freenode.net.
-
-  <p class=footer>&copy; Copyright 2010 by <a href=http://lucumr.pocoo.org/>Armin Ronacher</a>
-</div>
-
-<a href="http://github.com/mitsuhiko/flask"><img style="position: fixed; top: 0; right: 0; border: 0;"
-  src="http://s3.amazonaws.com/github/ribbons/forkme_right_gray_6d6d6d.png" alt="Fork me on GitHub"></a>
diff --git a/website/logo.png b/website/logo.png
deleted file mode 100644
index f255eece..00000000
Binary files a/website/logo.png and /dev/null differ
diff --git a/website/mask.png b/website/mask.png
deleted file mode 100644
index f2fdbe14..00000000
Binary files a/website/mask.png and /dev/null differ
diff --git a/website/ship.png b/website/ship.png
deleted file mode 100644
index 49eca5d4..00000000
Binary files a/website/ship.png and /dev/null differ
