diff --git a/examples/wscript b/examples/wscript
deleted file mode 100644
index e40b05092..000000000
--- a/examples/wscript
+++ /dev/null
@@ -1,23 +0,0 @@
-## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
-
-def build(bld):
-    env = bld.env_of_name('default')
-    if env['ENABLE_EXAMPLES']:
-        bld.add_subdirs('animation')
-        bld.add_subdirs('csma')
-        bld.add_subdirs('emulation')
-        bld.add_subdirs('error-model')
-        bld.add_subdirs('flowmon')
-        bld.add_subdirs('ipv6')
-        bld.add_subdirs('mesh')
-        bld.add_subdirs('naming')
-        bld.add_subdirs('realtime')
-        bld.add_subdirs('routing')
-        bld.add_subdirs('stats')
-        bld.add_subdirs('tap')
-        bld.add_subdirs('tcp')
-        bld.add_subdirs('tunneling')
-        bld.add_subdirs('tutorial')
-        bld.add_subdirs('udp')
-        bld.add_subdirs('wireless')
-        bld.add_subdirs('udp-client-server')
diff --git a/wscript b/wscript
index ba2a6d795..4d0b5a8e7 100644
--- a/wscript
+++ b/wscript
@@ -471,6 +471,14 @@ def create_ns3_program(bld, name, dependencies=('simulator',)):
             program.env.append_value('LINKFLAGS', '-Wl,-Bdynamic,--no-whole-archive')
     return program
 
+def add_examples_programs(bld):
+    env = bld.env_of_name('default')
+    if env['ENABLE_EXAMPLES']:
+        for dir in os.listdir('examples'):
+            if os.path.isdir(os.path.join('examples', dir)):
+                bld.add_subdirs(os.path.join('examples', dir))
+
+
 def add_scratch_programs(bld):
     all_modules = [mod[len("ns3-"):] for mod in bld.env['NS3_MODULES']]
     for filename in os.listdir("scratch"):
@@ -512,8 +520,8 @@ def build(bld):
     bld.add_subdirs('src')
     bld.add_subdirs('samples')
     bld.add_subdirs('utils')
-    bld.add_subdirs('examples')
 
+    add_examples_programs(bld)
     add_scratch_programs(bld)
 
     ## if --enabled-modules option was given, we disable building the