diff --git a/doc/examples/Makefile b/doc/examples/Makefile
index 4561b10bad..f8abdff4e3 100644
--- a/doc/examples/Makefile
+++ b/doc/examples/Makefile
@@ -3,7 +3,7 @@ FFMPEG_LIBS=libavdevice libavformat libavfilter libavcodec libswscale libavutil
 CFLAGS+=$(shell pkg-config  --cflags $(FFMPEG_LIBS))
 LDFLAGS+=$(shell pkg-config --libs $(FFMPEG_LIBS))
 
-EXAMPLES=encoding muxing
+EXAMPLES=encoding metadata muxing
 
 OBJS=$(addsuffix .o,$(EXAMPLES))
 
diff --git a/libavformat/metadata-example.c b/doc/examples/metadata.c
similarity index 97%
rename from libavformat/metadata-example.c
rename to doc/examples/metadata.c
index 7bf77e7378..7d29be7049 100644
--- a/libavformat/metadata-example.c
+++ b/doc/examples/metadata.c
@@ -22,7 +22,6 @@
 
 /**
  * @file
- * @example libavformat/metadata-example.c
  * Shows how the metadata API can be used in application programs.
  */
 
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 27a6a9b08e..6d7a342c9e 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -341,7 +341,6 @@ OBJS-$(CONFIG_UDP_PROTOCOL)              += udp.o
 OBJS-$(CONFIG_ALSA_INDEV)                += timefilter.o
 OBJS-$(CONFIG_JACK_INDEV)                += timefilter.o
 
-EXAMPLES  = metadata
 TESTPROGS = timefilter
 
 include $(SRC_PATH)/subdir.mak