diff --git a/bin/install-category b/bin/install-category
index 7d6ae94..530c7d1 100755
--- a/bin/install-category
+++ b/bin/install-category
@@ -53,7 +53,7 @@ EOF
 
 	cat <<EOF
 		<section id="form">
-			<form id="puzzler" action="../../cgi/puzzler.cgi" method="get" accept-charset="utf-8" autocomplete="off">
+			<form id="puzzler" action="../../cgi-bin/puzzler.cgi" method="get" accept-charset="utf-8" autocomplete="off">
 				<input type="hidden" name="c" value="$cat">
 				<input type="hidden" name="p" value="$points">
 				<div>Team hash:<input name="t" size="8"></div>
diff --git a/bin/once b/bin/once
index 870fc65..a5e9332 100755
--- a/bin/once
+++ b/bin/once
@@ -24,7 +24,7 @@ find state/points.new -type f | while read fn; do
 done
 
 # Generate new puzzles.html
-if www/cgi/puzzles.cgi > www/puzzles.new; then
+if www/cgi-bin/puzzles.cgi > www/puzzles.new; then
 	mv www/puzzles.new www/puzzles.html
 fi
 
diff --git a/install b/install
index 71db6e8..f53a293 100755
--- a/install
+++ b/install
@@ -45,7 +45,7 @@ setup() {
 
 
 echo "Figuring out web user..."
-for www in www-data http _; do
+for www in www-data http tc _; do
 	id $www && break
 done
 if [ $www = _ ]; then
@@ -72,4 +72,4 @@ git ls-files | while read fn; do
 		echo "??? $fn"
 		;;
 	esac
-done
\ No newline at end of file
+done
diff --git a/www/cgi/cgi.lua b/www/cgi-bin/cgi.lua
similarity index 100%
rename from www/cgi/cgi.lua
rename to www/cgi-bin/cgi.lua
diff --git a/www/cgi/koth.lua b/www/cgi-bin/koth.lua
similarity index 100%
rename from www/cgi/koth.lua
rename to www/cgi-bin/koth.lua
diff --git a/www/cgi/puzzler.cgi b/www/cgi-bin/puzzler.cgi
similarity index 94%
rename from www/cgi/puzzler.cgi
rename to www/cgi-bin/puzzler.cgi
index f40393f..a8637d1 100755
--- a/www/cgi/puzzler.cgi
+++ b/www/cgi-bin/puzzler.cgi
@@ -1,6 +1,6 @@
 #! /usr/bin/lua
 
-package.path = "?.lua;cgi/?.lua;www/cgi/?.lua"
+package.path = "?.lua;cgi-bin/?.lua;www/cgi-bin/?.lua"
 
 local cgi = require "cgi"
 local koth = require "koth"
diff --git a/www/cgi/puzzles.cgi b/www/cgi-bin/puzzles.cgi
similarity index 93%
rename from www/cgi/puzzles.cgi
rename to www/cgi-bin/puzzles.cgi
index 1fecbd0..b2ab687 100755
--- a/www/cgi/puzzles.cgi
+++ b/www/cgi-bin/puzzles.cgi
@@ -1,6 +1,6 @@
 #! /usr/bin/lua
 
-package.path = "?.lua;cgi/?.lua;www/cgi/?.lua"
+package.path = "?.lua;cgi-bin/?.lua;www/cgi-bin/?.lua"
 
 local koth = require "koth"
 
@@ -46,4 +46,4 @@ end
 body = body .. "</dl>\n"
 body = body .. "<p>Reloading this page periodically may yield updated puzzle lists.</p>"
 
-koth.page("Open Puzzles", body)
\ No newline at end of file
+koth.page("Open Puzzles", body)
diff --git a/www/cgi/register.cgi b/www/cgi-bin/register.cgi
similarity index 94%
rename from www/cgi/register.cgi
rename to www/cgi-bin/register.cgi
index 46a2b84..8c5e310 100755
--- a/www/cgi/register.cgi
+++ b/www/cgi-bin/register.cgi
@@ -1,6 +1,6 @@
 #! /usr/bin/lua
 
-package.path = "?.lua;cgi/?.lua;www/cgi/?.lua"
+package.path = "?.lua;cgi-bin/?.lua;www/cgi-bin/?.lua"
 
 
 local cgi = require "cgi"
diff --git a/www/register.html b/www/register.html
index 6af3602..1f94238 100644
--- a/www/register.html
+++ b/www/register.html
@@ -24,7 +24,7 @@
 				you don't need to do it again.
 			</p>
 			
-			<form method="get" action="cgi/register.cgi">
+			<form method="get" action="cgi-bin/register.cgi">
 				<label>Team Hash:</label>
 				<input type="text" name="h">
 				<br>