diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 752c22f4..47325d45 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -48,11 +48,4 @@ if ( UNIX )
     DESTINATION ${MAN_INSTALL_DIR} )
 endif ( UNIX )
 
-include ( FluidUnitTest )
-add_custom_target ( demo )
-
-ADD_FLUID_DEMO ( example )
-ADD_FLUID_DEMO ( fluidsynth_arpeggio )
-ADD_FLUID_DEMO ( fluidsynth_fx )
-ADD_FLUID_DEMO ( fluidsynth_metronome )
-ADD_FLUID_DEMO ( fluidsynth_simple )
+add_subdirectory ( examples )
diff --git a/doc/Doxyfile b/doc/Doxyfile
index 8ce12644..0f80df9c 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -100,7 +100,7 @@ EXCLUDE =
 EXCLUDE_SYMLINKS = NO
 EXCLUDE_PATTERNS = fluid_*.h
 EXCLUDE_SYMBOLS = 
-EXAMPLE_PATH = ../doc
+EXAMPLE_PATH = ../doc/examples
 EXAMPLE_PATTERNS = *.c
 EXAMPLE_RECURSIVE = NO
 IMAGE_PATH = 
diff --git a/doc/Doxyfile.cmake b/doc/Doxyfile.cmake
index 0250a439..305ca9db 100644
--- a/doc/Doxyfile.cmake
+++ b/doc/Doxyfile.cmake
@@ -102,7 +102,7 @@ EXCLUDE =
 EXCLUDE_SYMLINKS = NO
 EXCLUDE_PATTERNS = fluid_*.h
 EXCLUDE_SYMBOLS = 
-EXAMPLE_PATH = @CMAKE_SOURCE_DIR@/doc
+EXAMPLE_PATH = @CMAKE_SOURCE_DIR@/doc/examples
 EXAMPLE_PATTERNS = *.c
 EXAMPLE_RECURSIVE = NO
 IMAGE_PATH = 
diff --git a/doc/examples/CMakeLists.txt b/doc/examples/CMakeLists.txt
new file mode 100644
index 00000000..ec75a521
--- /dev/null
+++ b/doc/examples/CMakeLists.txt
@@ -0,0 +1,30 @@
+# FluidSynth - A Software Synthesize
+#
+# Copyright (C) 2003-2010 Peter Hanappe and others.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License
+# as published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307, USA
+
+# CMake based build system. Pedro Lopez-Cabanillas <plcl@users.sf.net>
+
+include ( FluidUnitTest )
+add_custom_target ( demo )
+
+ADD_FLUID_DEMO ( example )
+ADD_FLUID_DEMO ( fluidsynth_arpeggio )
+ADD_FLUID_DEMO ( fluidsynth_fx )
+ADD_FLUID_DEMO ( fluidsynth_metronome )
+ADD_FLUID_DEMO ( fluidsynth_simple )
+
diff --git a/doc/example.c b/doc/examples/example.c
similarity index 100%
rename from doc/example.c
rename to doc/examples/example.c
diff --git a/doc/fluidsynth_arpeggio.c b/doc/examples/fluidsynth_arpeggio.c
similarity index 100%
rename from doc/fluidsynth_arpeggio.c
rename to doc/examples/fluidsynth_arpeggio.c
diff --git a/doc/fluidsynth_fx.c b/doc/examples/fluidsynth_fx.c
similarity index 100%
rename from doc/fluidsynth_fx.c
rename to doc/examples/fluidsynth_fx.c
diff --git a/doc/fluidsynth_metronome.c b/doc/examples/fluidsynth_metronome.c
similarity index 100%
rename from doc/fluidsynth_metronome.c
rename to doc/examples/fluidsynth_metronome.c
diff --git a/doc/fluidsynth_process.c b/doc/examples/fluidsynth_process.c
similarity index 100%
rename from doc/fluidsynth_process.c
rename to doc/examples/fluidsynth_process.c
diff --git a/doc/fluidsynth_register_adriver.c b/doc/examples/fluidsynth_register_adriver.c
similarity index 100%
rename from doc/fluidsynth_register_adriver.c
rename to doc/examples/fluidsynth_register_adriver.c
diff --git a/doc/fluidsynth_sfload_mem.c b/doc/examples/fluidsynth_sfload_mem.c
similarity index 100%
rename from doc/fluidsynth_sfload_mem.c
rename to doc/examples/fluidsynth_sfload_mem.c
diff --git a/doc/fluidsynth_simple.c b/doc/examples/fluidsynth_simple.c
similarity index 99%
rename from doc/fluidsynth_simple.c
rename to doc/examples/fluidsynth_simple.c
index 23bfff3b..0e8180a4 100644
--- a/doc/fluidsynth_simple.c
+++ b/doc/examples/fluidsynth_simple.c
@@ -17,6 +17,7 @@
 
 int main(int argc, char **argv)
 {
+    asdf
     fluid_settings_t *settings;
     fluid_synth_t *synth = NULL;
     fluid_audio_driver_t *adriver = NULL;