diff --git a/etc/codecs.conf b/etc/codecs.conf
index 8143ac2bab..d083d62afc 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -3786,6 +3786,13 @@ audiocodec dvdpcm
   format 0x10001
   driver dvdpcm
 
+audiocodec lpcm
+  info "Bluray LPCM"
+  status working
+  fourcc BPCM
+  driver ffmpeg
+  dll pcm_bluray
+
 audiocodec a52
   info "AC3-liba52"
   status working
diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c
index 3c7be34f25..7aa127b224 100644
--- a/libmpdemux/mp_taglists.c
+++ b/libmpdemux/mp_taglists.c
@@ -63,6 +63,7 @@ static const AVCodecTag mp_wav_override_tags[] = {
     { CODEC_ID_PCM_S24LE,         1},
     { CODEC_ID_PCM_S32BE,         MKTAG('i', 'n', '3', '2')},
     { CODEC_ID_PCM_S32LE,         1},
+    { CODEC_ID_PCM_BLURAY,        MKTAG('B', 'P', 'C', 'M')},
     { 0, 0 },
 };