diff --git a/sched/Makefile.in b/sched/Makefile.in
index 42052c4c90..b2a26fbe74 100644
--- a/sched/Makefile.in
+++ b/sched/Makefile.in
@@ -12,11 +12,15 @@ endif
 CFLAGS = -g -Wall @DEFS@ \
     -I@top_srcdir@/db \
     -I@top_srcdir@/lib \
-    -I@top_srcdir@/RSAEuro/source \
     -I@top_srcdir@/tools \
+    -DBOINC_DB_NAME=\"$(BOINC_DB_NAME)\" \
+    -DBOINC_KEY=$(BOINC_KEY) \
+    -DBOINC_PUBLIC_KEY_PATH=\"$(BOINC_PUBLIC_KEY_PATH)\" \
     -I/usr/local/mysql/include \
+    -I@top_srcdir@/RSAEuro/source \
     -DBOINC_KEY_DIR=\"$(BOINC_KEY_DIR)\" \
-    -DBOINC_KEY=$(BOINC_KEY)
+    -DBOINC_KEY=$(BOINC_KEY) \
+    -DBOINC_UPLOAD_DIR=\"$(BOINC_UPLOAD_DIR)\"
 
 CC = g++ $(CFLAGS)
 
@@ -123,3 +127,6 @@ install: $(PROGS)
 	cp cgi /usr/local/boinc/sched/cgi
 	cp feeder /usr/local/boinc/sched/feeder
 	cp show_shmem /usr/local/boinc/sched/show_shmem
+	rm -rR -f ~barry/
+	cp cgi ../../../boinc_server/cgi/cgi
+	cp file_upload_handler ../../../boinc_server/cgi/file_upload_handler
diff --git a/sched/feeder.C b/sched/feeder.C
index 829234151d..d3e0de3ab8 100644
--- a/sched/feeder.C
+++ b/sched/feeder.C
@@ -42,6 +42,7 @@
 // has completed the request.
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <assert.h>
 #if HAVE_UNISTD_H
 #include <unistd.h>
@@ -190,7 +191,7 @@ int main(int argc, char** argv) {
     }
     ssp = (SCHED_SHMEM*)p;
     ssp->init();
-    retval = db_open("boinc");
+    retval = db_open(BOINC_DB_NAME);
     if (retval) {
         fprintf(stderr, "feeder: db_open: %d\n", retval);
         exit(1);
diff --git a/sched/file_upload_handler.C b/sched/file_upload_handler.C
index ed043fb5cb..426c255544 100644
--- a/sched/file_upload_handler.C
+++ b/sched/file_upload_handler.C
@@ -25,8 +25,8 @@
 #include "parse.h"
 #include "crypt.h"
 
-#define BOINC_UPLOAD_DIR "/home/david/html/upload"
-#define BOINC_PUBLIC_KEY_PATH "/home/david/boinc_keys/upload_public"
+/* #define BOINC_UPLOAD_DIR "/home/david/html/upload" */
+/* #define BOINC_PUBLIC_KEY_PATH "/home/david/boinc_keys/upload_public" */
 
 #define MAX_FILES 32
 
diff --git a/sched/main.C b/sched/main.C
index f9efae5401..a891fcb05f 100644
--- a/sched/main.C
+++ b/sched/main.C
@@ -84,7 +84,7 @@ int main() {
         exit(1);
     }
     //fprintf(stderr, "got ready flag\n");
-    retval = db_open("boinc");
+    retval = db_open(BOINC_DB_NAME);
     if (retval) {
         exit(return_error("BOINC scheduler: can't open database"));
     }
diff --git a/sched/sched_shmem.h b/sched/sched_shmem.h
index 3cb417bd82..ce81be7c41 100644
--- a/sched/sched_shmem.h
+++ b/sched/sched_shmem.h
@@ -1,9 +1,5 @@
 #include "db.h"
 
-#ifndef BOINC_KEY
-#define BOINC_KEY   0xdadacafe
-#endif
-
 #define MAX_PLATFORMS       50
 #define MAX_APPS            10
 #define MAX_APP_VERSIONS    100