diff --git a/CHANGES.html b/CHANGES.html
index 6ab679504..5ced0f95f 100644
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -80,6 +80,8 @@ us a note on ns-developers mailing list.</p>
     and <b>WifiPhy::MaxSupportedRxSpatialStreams</b>. A new attribute <b>WifiPhy::Antennas</b>
     was added to allow users to define the number of physical antennas on the device.
 </li>
+<li> Behavior for running Python programs was aligned with that of C++ programs; the list of modules built is no longer printed out.
+</li>
 </ul>
 <h2>Changed behavior:</h2>
 <ul>
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 908bbfba1..cdae3700f 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -36,6 +36,7 @@ Bugs fixed
 - Bug 2511 - HT Greenfield is not working
 - Bug 2512 - Byte mode not configured correctly in red-queue-disc-test-suite.cc
 - Bug 2513 - ParetoRandomVariable needs a "scale", not a "mean" attribute.
+- Bug 2518 - Suppress printing of list of modules for Python programs
 - Bug 2521 - Include ipv6-option.h in wscript
 - Bug 2527 - PrintRoutingTable extended to add an optional Time::Units parameter
 - Bug 2529 - Missing trace when Block ACK timeout is triggered or when missing MPDUs are announced by a Block ACK response
diff --git a/wscript b/wscript
index 8598296c0..1c32547a9 100644
--- a/wscript
+++ b/wscript
@@ -975,6 +975,8 @@ def build(bld):
         for gen in bld.all_task_gen:
             if type(gen).__name__ in ['ns3header_taskgen', 'ns3privateheader_taskgen', 'ns3moduleheader_taskgen']:
                 gen.post()
+
+    if Options.options.run or Options.options.pyrun:
         bld.env['PRINT_BUILT_MODULES_AT_END'] = False 
 
     if Options.options.doxygen_no_build: