diff --git a/NEWS b/NEWS
index 347ad8f5a..a90fdc93c 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ ver 0.18.6 (not yet released)
   - osx: fix build failure
 * mixer
   - alsa: fix build failure with uClibc
+* fix replay gain during cross-fade
 * accept files without metadata
 
 ver 0.18.5 (2013/11/23)
diff --git a/src/OutputControl.cxx b/src/OutputControl.cxx
index 553507a2a..27f280231 100644
--- a/src/OutputControl.cxx
+++ b/src/OutputControl.cxx
@@ -101,6 +101,8 @@ audio_output_set_replay_gain_mode(struct audio_output *ao,
 {
 	if (ao->replay_gain_filter != nullptr)
 		replay_gain_filter_set_mode(ao->replay_gain_filter, mode);
+	if (ao->other_replay_gain_filter != nullptr)
+		replay_gain_filter_set_mode(ao->other_replay_gain_filter, mode);
 }
 
 void