diff --git a/INSTALL b/INSTALL
index 57751405..45c5a42b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -10,6 +10,8 @@ To compile and install FCEUX for SDL, follow these steps:
 
   4.  To install, run "scons install".  You can optionally define a prefix with "scons --prefix=/usr install"
 
+  5.  To compile the server, run "scons fceux-server" or run "make" in the "fceux-server" directory.
+
 Users of Microsoft Visual Studio can use the solution files within the vc directory.
 These solution files will compile FCEUX and some included libraries for full functionality.
 
diff --git a/SConstruct b/SConstruct
index 0277d8d8..4f93121a 100644
--- a/SConstruct
+++ b/SConstruct
@@ -139,6 +139,7 @@ else:
 
 Export('env')
 fceux = SConscript('src/SConscript')
+env.Program(target="fceux-net-server", source=["fceux-server/server.cpp", "fceux-server/md5.cpp", "fceux-server/throttle.cpp"])
 # Install rules
 if prefix == None:
   prefix = "/usr/local"
@@ -173,3 +174,5 @@ env.Alias('install', env.Command(auxlib_inst_dst, auxlib_src, [Copy(auxlib_inst_
 env.Alias('install', env.Command(share_dst, share_src, [Copy(share_dst, share_src)]))
 env.Alias('install', env.Command(man_dst, man_src, [Copy(man_dst, man_src)]))
 env.Alias('install', (prefix + "/bin/"))
+
+
diff --git a/fceux-server/Makefile b/fceux-server/Makefile
index 63ad2f10..02d07f07 100644
--- a/fceux-server/Makefile
+++ b/fceux-server/Makefile
@@ -12,7 +12,7 @@ clean:
 		rm -f ${OUTFILE} ${OBJS}
 
 install:
-		install -m 755 -D fceux--server ${PREFIX}/bin/fceux-server
+		install -m 755 -D fceux-net-server ${PREFIX}/bin/fceux-server
 		install -m 644 -D fceux-server.conf /etc/fceux-server.conf
 
 server.o:	server.cpp