diff --git a/MAINTAINERS b/MAINTAINERS
index 89c165a5e9..f883dc581b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -127,7 +127,7 @@ Codecs:
   dxa.c                                 Kostya Shishkov
   dv.c                                  Roman Shaposhnik
   ffv1.c                                Michael Niedermayer
-  flac.c                                Alex Beregszaszi
+  flacdec.c                             Alex Beregszaszi
   flacenc.c                             Justin Ruggles
   flashsv*                              Benjamin Larsson
   flicvideo.c                           Mike Melanson
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 9c487fb1af..9abedfc607 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -82,7 +82,7 @@ OBJS-$(CONFIG_FFV1_DECODER)            += ffv1.o rangecoder.o
 OBJS-$(CONFIG_FFV1_ENCODER)            += ffv1.o rangecoder.o
 OBJS-$(CONFIG_FFVHUFF_DECODER)         += huffyuv.o
 OBJS-$(CONFIG_FFVHUFF_ENCODER)         += huffyuv.o
-OBJS-$(CONFIG_FLAC_DECODER)            += flac.o
+OBJS-$(CONFIG_FLAC_DECODER)            += flacdec.o
 OBJS-$(CONFIG_FLAC_ENCODER)            += flacenc.o lpc.o
 OBJS-$(CONFIG_FLASHSV_DECODER)         += flashsv.o
 OBJS-$(CONFIG_FLASHSV_ENCODER)         += flashsvenc.o
diff --git a/libavcodec/flac.c b/libavcodec/flacdec.c
similarity index 99%
rename from libavcodec/flac.c
rename to libavcodec/flacdec.c
index 30e58fbce6..16183f3b00 100644
--- a/libavcodec/flac.c
+++ b/libavcodec/flacdec.c
@@ -20,7 +20,7 @@
  */
 
 /**
- * @file flac.c
+ * @file flacdec.c
  * FLAC (Free Lossless Audio Codec) decoder
  * @author Alex Beregszaszi
  *