diff --git a/packages/mcp/www/register.cgi b/packages/mcp/www/register.cgi
index 9e491d1..6d84dda 100755
--- a/packages/mcp/www/register.cgi
+++ b/packages/mcp/www/register.cgi
@@ -1,5 +1,21 @@
 #! /bin/sh -e
 
+# Change to CTF_BASE
+cd ${CTF_BASE:-.}
+for i in $(seq 5); do
+	[ -d packages ] && break
+	cd ..
+done
+if ! [ -d packages ]; then
+	cat <<EOF
+Content-type: text/html
+
+Cannot find CTF_BASE
+EOF
+	exit 1
+fi
+
+# Read CGI parameters
 param () {
 	ret=$(echo "$QUERY_STRING" | tr '=&' ' \n' | awk -v "k=$1" '($1==k) {print $2;}')
 	ret=$(busybox httpd -d "$ret" || echo "$ret")
diff --git a/packages/mcp/www/state.cgi b/packages/mcp/www/state.cgi
deleted file mode 100755
index e09cf58..0000000
--- a/packages/mcp/www/state.cgi
+++ /dev/null
@@ -1,6 +0,0 @@
-#! /bin/sh
-
-echo 'Content-type: application/octet-stream'
-echo
-
-tar czf - /var/lib/ctf | KEY=crashmaster arc4