diff --git a/qw/source/Makefile.am b/qw/source/Makefile.am
index e1e8b589f..af0d4eab4 100644
--- a/qw/source/Makefile.am
+++ b/qw/source/Makefile.am
@@ -82,6 +82,7 @@ server_sources= crudefile.c sv_ccmds.c sv_cvar.c sv_ents.c \
 
 qf_server_LIBS= \
 		$(SERVER_PLUGIN_STATIC_LIBS) \
+		$(top_builddir)/libs/gamecode/builtins/libQFcsqc.la \
 		$(top_builddir)/libs/models/libQFmodels.la \
 		$(top_builddir)/libs/gamecode/builtins/libQFgamecode_builtins.la \
 		$(top_builddir)/libs/gamecode/engine/libQFgamecode.la \
diff --git a/qw/source/sv_progs.c b/qw/source/sv_progs.c
index d686a8fd3..4a6ee9036 100644
--- a/qw/source/sv_progs.c
+++ b/qw/source/sv_progs.c
@@ -39,6 +39,7 @@ static const char rcsid[] =
 #include <signal.h>
 
 #include "QF/cmd.h"
+#include "QF/csqc.h"		//FIXME d'oh, dumb name after all
 #include "QF/cvar.h"
 #include "QF/sys.h"
 
@@ -366,7 +367,9 @@ SV_Progs_Init (void)
 	sv_pr_state.prune_edict = prune_edict;
 	sv_pr_state.free_edict = free_edict; // eww, I hate the need for this :(
 
+	PR_Resources_Init (&sv_pr_state);
 	SV_PR_Cmds_Init ();
+	Cmd_Progs_Init (&sv_pr_state);
 
 	Cmd_AddCommand ("edict", ED_PrintEdict_f, "Report information on a given "
 					"edict in the game. (edict (edict number))");