diff --git a/doc/reference.conf b/doc/reference.conf
index f87d101..02a9ef0 100755
--- a/doc/reference.conf
+++ b/doc/reference.conf
@@ -1106,13 +1106,6 @@ general {
 	 * provided they have umode +s set */
 	oper_snomask = "+s";
 
-	/* servlink path: path to 'servlink' program used by ircd to handle
-	 * encrypted/compressed server <-> server links.
-	 *
-	 * only define if servlink is not in same directory as ircd itself.
-	 */
-	#servlink_path = "/usr/local/ircd/bin/servlink";
-
 	/* use egd: if your system does not have *random devices yet you
 	 * want to use OpenSSL and encrypted links, enable this.  Beware -
 	 * EGD is *very* CPU intensive when gathering data for its pool
diff --git a/include/client.h b/include/client.h
index 7027dde..02b39f9 100644
--- a/include/client.h
+++ b/include/client.h
@@ -400,16 +400,15 @@ struct exit_client_hook
 #define FLAGS_FLOODDONE    0x0100	/* flood grace period over / reported */
 #define FLAGS_NORMALEX     0x0400	/* Client exited normally */
 #define FLAGS_SENDQEX      0x0800	/* Sendq exceeded */
-#define FLAGS_SERVLINK     0x10000	/* servlink has servlink process */
-#define FLAGS_MARK	   0x20000	/* marked client */
-#define FLAGS_HIDDEN       0x40000	/* hidden server */
-#define FLAGS_EOB          0x80000	/* EOB */
-#define FLAGS_MYCONNECT	   0x100000	/* MyConnect */
-#define FLAGS_IOERROR      0x200000	/* IO error */
-#define FLAGS_SERVICE	   0x400000	/* network service */
-#define FLAGS_TGCHANGE     0x800000	/* we're allowed to clear something */
-#define FLAGS_DYNSPOOF     0x1000000	/* dynamic spoof, only opers see ip */
-#define FLAGS_EXUNKNOWN	   0x2000000	/* too many unknowns exit.. */
+#define FLAGS_MARK	   0x10000	/* marked client */
+#define FLAGS_HIDDEN       0x20000	/* hidden server */
+#define FLAGS_EOB          0x40000	/* EOB */
+#define FLAGS_MYCONNECT	   0x80000	/* MyConnect */
+#define FLAGS_IOERROR      0x100000	/* IO error */
+#define FLAGS_SERVICE	   0x200000	/* network service */
+#define FLAGS_TGCHANGE     0x400000	/* we're allowed to clear something */
+#define FLAGS_DYNSPOOF     0x800000	/* dynamic spoof, only opers see ip */
+#define FLAGS_EXUNKNOWN	   0x1000000	/* too many unknowns exit.. */
 
 /* flags for local clients, this needs stuff moved from above to here at some point */
 #define LFLAGS_SSL		0x00000001
diff --git a/include/config.h b/include/config.h
index daa8652..04fcfdb 100644
--- a/include/config.h
+++ b/include/config.h
@@ -61,7 +61,6 @@
 /* files */
 #define SPATH    BINPATH "/ircd"		   /* ircd executable */
 #define LIPATH   LIBPATH "/libircd" SHARED_SUFFIX  /* ircd library */
-#define SLPATH   BINPATH "/servlink"		   /* servlink executable */
 #define CPATH    ETCPATH "/ircd.conf"		   /* ircd.conf file */
 #define KPATH    ETCPATH "/kline.conf"		   /* kline file */
 #define DLPATH   ETCPATH "/dline.conf"		   /* dline file */
diff --git a/include/config.h.dist b/include/config.h.dist
index daa8652..04fcfdb 100644
--- a/include/config.h.dist
+++ b/include/config.h.dist
@@ -61,7 +61,6 @@
 /* files */
 #define SPATH    BINPATH "/ircd"		   /* ircd executable */
 #define LIPATH   LIBPATH "/libircd" SHARED_SUFFIX  /* ircd library */
-#define SLPATH   BINPATH "/servlink"		   /* servlink executable */
 #define CPATH    ETCPATH "/ircd.conf"		   /* ircd.conf file */
 #define KPATH    ETCPATH "/kline.conf"		   /* kline file */
 #define DLPATH   ETCPATH "/dline.conf"		   /* dline file */
diff --git a/src/newconf.c b/src/newconf.c
index ed2dd9d..6e66204 100644
--- a/src/newconf.c
+++ b/src/newconf.c
@@ -2035,7 +2035,6 @@ static struct ConfEntry conf_general_table[] =
 	{ "kline_reason",	CF_QSTRING, NULL, REALLEN, &ConfigFileEntry.kline_reason },
 	{ "identify_service",	CF_QSTRING, NULL, REALLEN, &ConfigFileEntry.identifyservice },
 	{ "identify_command",	CF_QSTRING, NULL, REALLEN, &ConfigFileEntry.identifycommand },
-	{ "servlink_path",	CF_QSTRING, NULL, MAXPATHLEN, &ConfigFileEntry.servlink_path },
 
 	{ "anti_spam_exit_message_time", CF_TIME,  NULL, 0, &ConfigFileEntry.anti_spam_exit_message_time },
 	{ "disable_fake_channels",	 CF_YESNO, NULL, 0, &ConfigFileEntry.disable_fake_channels },
diff --git a/src/s_conf.c b/src/s_conf.c
index 71f1c56..9b98fd5 100644
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -772,7 +772,6 @@ set_default_conf(void)
 	ConfigFileEntry.hide_error_messages = 1;
 	ConfigFileEntry.dots_in_ident = 0;
 	ConfigFileEntry.max_targets = MAX_TARGETS_DEFAULT;
-	ConfigFileEntry.servlink_path = rb_strdup(SLPATH);
 	ConfigFileEntry.egdpool_path = NULL;
 	ConfigFileEntry.use_whois_actually = YES;
 	ConfigFileEntry.burst_away = NO;
@@ -858,9 +857,6 @@ validate_conf(void)
 	if(ConfigFileEntry.ts_max_delta < TS_MAX_DELTA_MIN)
 		ConfigFileEntry.ts_max_delta = TS_MAX_DELTA_DEFAULT;
 
-	if(ConfigFileEntry.servlink_path == NULL)
-		ConfigFileEntry.servlink_path = rb_strdup(SLPATH);
-
 	if(ServerInfo.network_name == NULL)
 		ServerInfo.network_name = rb_strdup(NETWORK_NAME_DEFAULT);
 
@@ -1235,9 +1231,6 @@ clear_out_old_conf(void)
 	 */
 
 	/* clean out general */
-	rb_free(ConfigFileEntry.servlink_path);
-	ConfigFileEntry.servlink_path = NULL;
-
 	RB_DLINK_FOREACH_SAFE(ptr, next_ptr, service_list.head)
 	{
 		rb_free(ptr->data);