diff --git a/doc/example.conf b/doc/example.conf
index 77e11c5..6cb3e20 100755
--- a/doc/example.conf
+++ b/doc/example.conf
@@ -198,11 +198,6 @@ auth {
 	 */
 	autojoin = "#shadowircd,#test";
 
-	/* autojoin_opers : Channel (or channels, comma-seperated) to join
-	 * opers to on oper-up.
-	 */
-	autojoin_opers = "#opers,#help";
-
 	/* Possible flags in auth:
 	 * 
 	 * encrypted                  | password is encrypted with mkpasswd
diff --git a/doc/reference.charybdis.conf b/doc/reference.charybdis.conf
index a5625ed..9364133 100755
--- a/doc/reference.charybdis.conf
+++ b/doc/reference.charybdis.conf
@@ -373,11 +373,6 @@ auth {
 	 */
 	autojoin = "#shadowircd,#test";
 
-	/* autojoin_opers : Channel (or channels, comma-seperated) to join
-	 * opers to on oper-up.
-	 */
-	autojoin_opers = "#opers,#help";
-
 	/* Possible flags in auth:
 	 * 
 	 * encrypted                  | password is encrypted with mkpasswd
diff --git a/doc/reference.conf b/doc/reference.conf
index 94152c8..e3238ba 100755
--- a/doc/reference.conf
+++ b/doc/reference.conf
@@ -376,11 +376,6 @@ auth {
 	 */
 	autojoin = "#shadowircd,#test";
 
-	/* autojoin_opers : Channel (or channels, comma-seperated) to join
-	 * opers to on oper-up.
-	 */
-	autojoin_opers = "#opers,#help";
-
 	/* Possible flags in auth:
 	 * 
 	 * encrypted                  | password is encrypted with mkpasswd
diff --git a/src/newconf.c b/src/newconf.c
index 1ebc287..cf31f7a 100644
--- a/src/newconf.c
+++ b/src/newconf.c
@@ -1086,15 +1086,6 @@ conf_set_auth_autojoin(void *data)
 	yy_aconf->autojoin = rb_strdup(data);
 }
 
-static void
-conf_set_auth_autojoin_opers(void *data)
-{
-	if(yy_aconf->autojoin_opers)
-		memset(yy_aconf->autojoin_opers, 0, strlen(yy_aconf->autojoin_opers));
-	rb_free(yy_aconf->autojoin_opers);
-	yy_aconf->autojoin_opers = rb_strdup(data);
-}
-
 static void
 conf_set_auth_spoof(void *data)
 {
@@ -2233,7 +2224,6 @@ static struct ConfEntry conf_auth_table[] =
 	{ "class",	CF_QSTRING, conf_set_auth_class,	0, NULL },
 	{ "spoof",	CF_QSTRING, conf_set_auth_spoof,	0, NULL },
 	{ "autojoin",  CF_QSTRING, conf_set_auth_autojoin,		0, NULL },
-	{ "autojoin_opers",	CF_QSTRING, conf_set_auth_autojoin_opers,	0, NULL },
 	{ "redirserv",	CF_QSTRING, conf_set_auth_redir_serv,	0, NULL },
 	{ "redirport",	CF_INT,     conf_set_auth_redir_port,	0, NULL },
 	{ "flags",	CF_STRING | CF_FLIST, conf_set_auth_flags,	0, NULL },
diff --git a/src/s_user.c b/src/s_user.c
index 1ca7ac1..a0ed74f 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -1431,16 +1431,6 @@ oper_up(struct Client *source_p, struct oper_conf *oper_p)
 
 	aconf = source_p->localClient->att_conf;
 
-	/* Do the auth::autojoin_opers wizardry here */
-	if(aconf->autojoin_opers != NULL)
-	{
-		/* opers should never be banned from the opers channel.
-		 * Plus this is post-umode being set so you'll pass +I $o or +O.
-		 * Hence why we're making this a normal clean join. --jdhore
-		 */
-		user_join(&me, source_p, aconf->autojoin_opers, NULL);
-	}
-
 	/* If we're setting +p, expire it */
 	if(ConfigFileEntry.expire_override_time && MyClient(source_p) && source_p->umodes & UMODE_OVERRIDE)
 	{