3 files changed, 1 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index e5fd491d..a113dd5b 100644
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,7 @@ ver 0.16 (20??/??/??)
 * commands:
   - added new "status" line with more precise "elapsed time"
 * log unused/unknown block parameters
+* removed the deprecated "error_file" option
 * save state when stopped
 * renamed option "--stdout" to "--stderr"
 * obey $(sysconfdir) for default mpd.conf location
diff --git a/src/conf.c b/src/conf.c
index ce80100f..48c58b1a 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -53,7 +53,6 @@ static struct config_entry config_entries[] = {
 	{ .name = CONF_DB_FILE, false, false },
 	{ .name = CONF_STICKER_FILE, false, false },
 	{ .name = CONF_LOG_FILE, false, false },
-	{ .name = CONF_ERROR_FILE, false, false },
 	{ .name = CONF_PID_FILE, false, false },
 	{ .name = CONF_STATE_FILE, false, false },
 	{ .name = CONF_USER, false, false },
diff --git a/src/conf.h b/src/conf.h
index 4eb9db63..a153b715 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -30,7 +30,6 @@
 #define CONF_DB_FILE                    "db_file"
 #define CONF_STICKER_FILE "sticker_file"
 #define CONF_LOG_FILE                   "log_file"
-#define CONF_ERROR_FILE                 "error_file"
 #define CONF_PID_FILE                   "pid_file"
 #define CONF_STATE_FILE                 "state_file"
 #define CONF_USER                       "user"