diff --git a/configure.ac b/configure.ac
index daacc73eb..490ddecf8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,16 +79,6 @@ fi
 AM_CONDITIONAL(ENABLE_NETWORK_OLK, test "x$with_network_olk" != "xno" -a "x$with_multiplayer" = "xno")
 AM_CONDITIONAL(ENABLE_MPLAYER_AS, test "x$with_multiplayer" != "xno")
 
-AC_ARG_WITH(multiserver, [  --with-multiserver      Include multiplayer client/server support])
-
-if test "x$with_multiserver" = "xno"; then
-  echo "Building without multiplayer client/server support"
-else
-  echo "Building with multiplayer client/server support"
-  AC_DEFINE([FG_MSERVER_AS], 1, [Define to build with multiplayer client/server support])
-fi
-
-AM_CONDITIONAL(ENABLE_MSERVER_AS, test "x$with_multiserver" != "xno")
 
 # Specify if we want to use WeatherCM instead of FGEnvironment.
 # default to with_weathercm=no
@@ -556,7 +546,6 @@ AC_CONFIG_FILES([ \
 	src/Replay/Makefile \
 	src/Scenery/Makefile \
 	src/Scripting/Makefile \
-	src/Server/Makefile \
 	src/Sound/Makefile \
 	src/Systems/Makefile \
 	src/Time/Makefile \
@@ -606,10 +595,6 @@ elif test "x$with_network_olk" != "xno"; then
     echo "Using Oliver's multi-pilot network support"
 fi
 
-if test "x$with_multiserver" != "xno"; then
-    echo "Using multiplayer client/server support"
-fi
-
 if test "x$with_threads" = "xyes"; then
     echo "threads: yes"
 else
diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index 18c241819..a5492ddb0 100644
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -10,12 +10,6 @@ else
 MPLAYER_LIBS = 
 endif
 
-if ENABLE_MSERVER_AS
-MSERVER_LIBS = $(top_builddir)/src/Server/libServer.a
-else
-MSERVER_LIBS = 
-endif
-
 if ENABLE_NETWORK_OLK
 NETWORK_LIBS = $(top_builddir)/src/NetworkOLK/libNetworkOLK.a
 else
@@ -98,7 +92,6 @@ fgfs_LDADD = \
 	$(top_builddir)/src/Sound/libSound.a \
 	$(top_builddir)/src/Airports/libAirports.a \
 	$(MPLAYER_LIBS) \
-	$(MSERVER_LIBS) \
         $(NETWORK_LIBS) \
 	$(top_builddir)/src/Objects/libObjects.a \
 	$(top_builddir)/src/Replay/libReplay.a \
diff --git a/src/Makefile.am b/src/Makefile.am
index 10470774c..d88af9347 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,12 +16,6 @@ else
 MPLAYER_DIRS =
 endif
 
-if ENABLE_MSERVER_AS
-MSERVER_DIRS = Server
-else
-MSERVER_DIRS =
-endif
-
 if ENABLE_NETWORK_OLK
 NETWORK_DIRS = NetworkOLK
 else
@@ -44,7 +38,6 @@ SUBDIRS = \
         Navaids \
         Network \
 	$(MPLAYER_DIRS) \
-	$(MSERVER_DIRS) \
         $(NETWORK_DIRS) \
         Objects \
 	Replay \