diff --git a/.gitignore b/.gitignore
index 96494aad54..6f14290e03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,7 +17,6 @@
 *.so.*
 *.swp
 *.ver
-*-example
 *-test
 /.config
 /.version
diff --git a/doc/Doxyfile b/doc/Doxyfile
index 58f7dfbece..08c81f37ee 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -646,7 +646,7 @@ EXAMPLE_PATH           =
 # and *.h) to filter out the source-files in the directories. If left
 # blank all files are included.
 
-EXAMPLE_PATTERNS       = *-example.c
+EXAMPLE_PATTERNS       =
 
 # If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
 # searched for input files to be used with the \include or \dontinclude
diff --git a/doc/build_system.txt b/doc/build_system.txt
index c3dede7cde..3c5f15618f 100644
--- a/doc/build_system.txt
+++ b/doc/build_system.txt
@@ -19,11 +19,8 @@ all
 install
     Install headers, libraries and programs.
 
-libavformat/output-example
+doc/examples/output
     Build the libavformat basic example.
 
-libavcodec/api-example
-    Build the libavcodec basic example.
-
 libswscale/swscale-test
     Build the swscale self-test (useful also as example).
diff --git a/doc/developer.texi b/doc/developer.texi
index 00e2b6028f..5051d333bf 100644
--- a/doc/developer.texi
+++ b/doc/developer.texi
@@ -15,11 +15,11 @@
 
 @itemize @bullet
 @item libavcodec is the library containing the codecs (both encoding and
-decoding). Look at @file{libavcodec/apiexample.c} to see how to use it.
+decoding). Look at @file{doc/examples/avcodec.c} to see how to use it.
 
 @item libavformat is the library containing the file format handling (mux and
 demux code for several formats). Look at @file{avplay.c} to use it in a
-player. See @file{libavformat/output-example.c} to use it to generate
+player. See @file{doc/examples/output.c} to use it to generate
 audio or video streams.
 @end itemize