diff --git a/AUTHORS b/AUTHORS
index e9437d07c1..1c23c3e5da 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,6 +3,7 @@
 
 Adam Fedor <adam.fedor@gmail.com>
 Alexander Brauckmann <a.brauckmann@gmail.com>
+Alexandre Gouaillard <agouaillard@gmail.com>
 Andrew MacDonald <andrew@webrtc.org>
 Anil Kumar <an1kumar@gmail.com>
 Ben Strong <bstrong@gmail.com>
diff --git a/webrtc/pc/rtpsender.cc b/webrtc/pc/rtpsender.cc
index c8ac830bf3..5cf13d060d 100644
--- a/webrtc/pc/rtpsender.cc
+++ b/webrtc/pc/rtpsender.cc
@@ -249,7 +249,7 @@ void AudioRtpSender::SetAudioSend() {
     return;
   }
   cricket::AudioOptions options;
-#if !defined(WEBRTC_CHROMIUM_BUILD)
+#if !defined(WEBRTC_CHROMIUM_BUILD) && !defined(WEBRTC_WEBKIT_BUILD)
   // TODO(tommi): Remove this hack when we move CreateAudioSource out of
   // PeerConnection.  This is a bit of a strange way to apply local audio
   // options since it is also applied to all streams/channels, local or remote.