diff --git a/Makefile b/Makefile
index 1957826..b309b88 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,7 @@ all: ctf.tce
 target: $(PYC)
 	$(INSTALL) -d --mode=0755 --owner=100 $(DESTDIR)/var/lib/ctf
 	$(INSTALL) -d $(DESTDIR)/var/lib/ctf/disabled
+	touch $(DESTDIR)/var/lib/ctf/disabled/survey
 
 	$(INSTALL) -d $(CTFDIR)
 	$(INSTALL) $(PYC) $(CTFDIR)
diff --git a/puzzles/survey/1000000/index.html b/puzzles/survey/1000000/index.html
new file mode 100644
index 0000000..2b39091
--- /dev/null
+++ b/puzzles/survey/1000000/index.html
@@ -0,0 +1,41 @@
+<p>
+  Thanks for playing Capture The Flag!  We would like to know what you
+  think of the game; please fill out this survey and you will
+  recieve a key redeemable for <b>ONE MILLION POINTS</b>.
+</p>
+
+<fieldset>
+  <legend>Survey</legend>
+
+  <form method="post" action="submit.cgi">
+    <ul>
+      <li>
+        Did you have any trouble figuring out how to play?
+        <select name="getting-started">
+          <option>A lot of trouble</option>
+          <option selected="selected">Not much trouble</option>
+          <option>No trouble</option>
+        </select>
+      </li>
+
+      <li>
+        How difficult were the puzzles?
+        <select name="puzzle-strength">
+          <option>Too hard</option>
+          <option selected="selected">About right</option>
+          <option>Too easy</option>
+        </select>
+      </li>
+    </ul>
+
+    <p>
+      Please use the provided space for any additional comments.
+    </p>
+    <textarea name="comments" style="height: 5em; width: 40em;"></textarea>
+    <p>
+      Thanks for your feedback!  We hope you had fun and learned
+      something!
+    </p>
+    <input type="submit" name="submit" value="Submit survey" />
+  </form>
+</fieldset>
diff --git a/puzzles/survey/1000000/key b/puzzles/survey/1000000/key
new file mode 100644
index 0000000..0bb4c84
--- /dev/null
+++ b/puzzles/survey/1000000/key
@@ -0,0 +1 @@
+quux blorb frotz
diff --git a/puzzles/survey/1000000/submit.cgi b/puzzles/survey/1000000/submit.cgi
new file mode 100755
index 0000000..bf1bbc4
--- /dev/null
+++ b/puzzles/survey/1000000/submit.cgi
@@ -0,0 +1,16 @@
+#! /usr/bin/env python3
+
+import cgi
+
+f = cgi.FieldStorage()
+if f.getfirst('submit'):
+    print('Content-type: text/plain')
+    print()
+    print('Thanks for filling in the survey.')
+    print()
+    print('The key is:')
+    print('    quux blorb frotz')
+else:
+    print('Content-type: text/plain')
+    print()
+    print('You need to actually fill in the form to get the key.')