diff --git a/src/command/command.c b/src/command/command.c
index e0f3fbf9..7ad59854 100644
--- a/src/command/command.c
+++ b/src/command/command.c
@@ -63,7 +63,7 @@ static char * _account_autocomplete(char *input, int *size);
 static char * _who_autocomplete(char *input, int *size);
 static char * _roster_autocomplete(char *input, int *size);
 static char * _group_autocomplete(char *input, int *size);
-static char * _bookmark_autocomplete(char *input, int *size);
+//static char * _bookmark_autocomplete(char *input, int *size);
 static char * _otr_autocomplete(char *input, int *size);
 static char * _connect_autocomplete(char *input, int *size);
 static char * _statuses_autocomplete(char *input, int *size);
@@ -297,7 +297,7 @@ static struct cmd_t command_defs[] =
           "Example : /rooms conference.jabber.org",
           "Example : /rooms (if logged in as me@server.org, is equivalent to /rooms conference.server.org)",
           NULL } } },
-
+/*
     { "/bookmark",
         cmd_bookmark, parse_args, 0, 4, NULL,
         { "/bookmark [add|list|remove] [room@server] [autojoin on|off] [nick nickname]",
@@ -306,7 +306,7 @@ static struct cmd_t command_defs[] =
           "---------------------------------------------------------------------------",
           "Manage bookmarks.",
           NULL } } },
-
+*/
     { "/disco",
         cmd_disco, parse_args, 1, 2, NULL,
         { "/disco command entity", "Service discovery.",
@@ -871,7 +871,7 @@ static Autocomplete close_ac;
 static Autocomplete wins_ac;
 static Autocomplete roster_ac;
 static Autocomplete group_ac;
-static Autocomplete bookmark_ac;
+//static Autocomplete bookmark_ac;
 static Autocomplete otr_ac;
 static Autocomplete otr_log_ac;
 static Autocomplete connect_property_ac;
@@ -1042,12 +1042,12 @@ cmd_init(void)
     autocomplete_add(who_ac, "available");
     autocomplete_add(who_ac, "unavailable");
     autocomplete_add(who_ac, "any");
-
+/*
     bookmark_ac = autocomplete_new();
     autocomplete_add(bookmark_ac, "add");
     autocomplete_add(bookmark_ac, "list");
     autocomplete_add(bookmark_ac, "remove");
-
+*/
     otr_ac = autocomplete_new();
     autocomplete_add(otr_ac, "gen");
     autocomplete_add(otr_ac, "start");
@@ -1117,7 +1117,7 @@ cmd_uninit(void)
     autocomplete_free(wins_ac);
     autocomplete_free(roster_ac);
     autocomplete_free(group_ac);
-    autocomplete_free(bookmark_ac);
+//    autocomplete_free(bookmark_ac);
     autocomplete_free(otr_ac);
     autocomplete_free(otr_log_ac);
     autocomplete_free(connect_property_ac);
@@ -1240,7 +1240,7 @@ cmd_reset_autocomplete()
     autocomplete_reset(wins_ac);
     autocomplete_reset(roster_ac);
     autocomplete_reset(group_ac);
-    autocomplete_reset(bookmark_ac);
+//    autocomplete_reset(bookmark_ac);
     autocomplete_reset(otr_ac);
     autocomplete_reset(otr_log_ac);
     autocomplete_reset(connect_property_ac);
@@ -1249,7 +1249,7 @@ cmd_reset_autocomplete()
     autocomplete_reset(alias_ac);
     autocomplete_reset(aliases_ac);
     autocomplete_reset(join_property_ac);
-    bookmark_autocomplete_reset();
+//    bookmark_autocomplete_reset();
 }
 
 // Command execution
@@ -1529,7 +1529,8 @@ _cmd_complete_parameters(char *input, int *size)
     autocompleter acs[] = { _who_autocomplete, _sub_autocomplete, _notify_autocomplete,
         _autoaway_autocomplete, _titlebar_autocomplete, _theme_autocomplete,
         _account_autocomplete, _roster_autocomplete, _group_autocomplete,
-        _bookmark_autocomplete, _autoconnect_autocomplete, _otr_autocomplete,
+//        _bookmark_autocomplete, _autoconnect_autocomplete, _otr_autocomplete,
+        _autoconnect_autocomplete, _otr_autocomplete,
         _connect_autocomplete, _statuses_autocomplete, _alias_autocomplete,
         _join_autocomplete };
 
@@ -1601,7 +1602,7 @@ _group_autocomplete(char *input, int *size)
 
     return NULL;
 }
-
+/*
 static char *
 _bookmark_autocomplete(char *input, int *size)
 {
@@ -1629,6 +1630,7 @@ _bookmark_autocomplete(char *input, int *size)
 
     return result;
 }
+*/
 
 static char *
 _notify_autocomplete(char *input, int *size)
diff --git a/src/xmpp/connection.c b/src/xmpp/connection.c
index d3c6d978..eade0ab3 100644
--- a/src/xmpp/connection.c
+++ b/src/xmpp/connection.c
@@ -439,7 +439,7 @@ _connection_handler(xmpp_conn_t * const conn,
         iq_add_handlers();
 
         roster_request();
-        bookmark_request();
+//        bookmark_request();
         jabber_conn.conn_status = JABBER_CONNECTED;
 
         if (prefs_get_reconnect() != 0) {