diff --git a/src/core/examples/wscript b/src/core/examples/wscript
index da239037e..6e6f04315 100644
--- a/src/core/examples/wscript
+++ b/src/core/examples/wscript
@@ -4,9 +4,6 @@ def build(bld):
     if not bld.env['ENABLE_EXAMPLES']:
         return;
 
-    obj = bld.create_ns3_program('main-attribute-value', ['network', 'point-to-point'])
-    obj.source = 'main-attribute-value.cc'
-
     obj = bld.create_ns3_program('main-callback', ['core'])
     obj.source = 'main-callback.cc'
 
diff --git a/src/core/examples/main-attribute-value.cc b/src/point-to-point/examples/main-attribute-value.cc
similarity index 100%
rename from src/core/examples/main-attribute-value.cc
rename to src/point-to-point/examples/main-attribute-value.cc
diff --git a/src/point-to-point/examples/wscript b/src/point-to-point/examples/wscript
new file mode 100644
index 000000000..8f561292e
--- /dev/null
+++ b/src/point-to-point/examples/wscript
@@ -0,0 +1,8 @@
+## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
+
+def build(bld):
+    if not bld.env['ENABLE_EXAMPLES']:
+        return;
+
+    obj = bld.create_ns3_program('main-attribute-value', ['network', 'point-to-point'])
+    obj.source = 'main-attribute-value.cc'
diff --git a/src/point-to-point/wscript b/src/point-to-point/wscript
index 2bc41aa29..ce8faa742 100644
--- a/src/point-to-point/wscript
+++ b/src/point-to-point/wscript
@@ -26,4 +26,7 @@ def build(bld):
         'helper/point-to-point-helper.h',
         ]
 
+    if (bld.env['ENABLE_EXAMPLES']):
+        bld.add_subdirs('examples')
+
     bld.ns3_python_bindings()