diff --git a/doc/tutorial/source/getting-started.rst b/doc/tutorial/source/getting-started.rst
index 8a8cb53a6..650596fb3 100644
--- a/doc/tutorial/source/getting-started.rst
+++ b/doc/tutorial/source/getting-started.rst
@@ -281,12 +281,11 @@ following magic words:
   'build' finished successfully (2m30.586s)
   
   Modules built: 
-  core, network, config-store, internet, propagation, point-to-point, 
-  csma, emu, bridge, tap-bridge, virtual-net-device, applications,
-  nix-vector-routing, olsr, aodv, dsdv, click, openflow, mobility, wifi,
-  netanim, stats, uan, spectrum, mesh, test, ns3tcp, ns3wifi,
-  flow-monitor, wimax, lte, mpi, topology-read, energy, tools,
-  visualizer
+  aodv, applications, bridge, click, config-store, core, csma, dsdv,
+  emu, energy, flow-monitor, internet, lte, mesh, mobility, mpi,
+  netanim, network, nix-vector-routing, ns3tcp, ns3wifi, olsr, openflow,
+  point-to-point, propagation, spectrum, stats, tap-bridge, test, tools,
+  topology-read, uan, virtual-net-device, visualizer, wifi, wimax
 
 Once the project has built you can say goodbye to your old friends, the 
 ``ns-3-allinone`` scripts.  You got what you needed from them and will now 
@@ -452,12 +451,11 @@ You will also see output from the test runner and the output will actually look
   'build' finished successfully (1.799s)
   
   Modules built: 
-  core, network, config-store, internet, propagation, point-to-point, 
-  csma, emu, bridge, tap-bridge, virtual-net-device, applications,
-  nix-vector-routing, olsr, aodv, dsdv, click, openflow, mobility, wifi,
-  netanim, stats, uan, spectrum, mesh, test, ns3tcp, ns3wifi,
-  flow-monitor, wimax, lte, mpi, topology-read, energy, tools,
-  visualizer
+  aodv, applications, bridge, click, config-store, core, csma, dsdv,
+  emu, energy, flow-monitor, internet, lte, mesh, mobility, mpi,
+  netanim, network, nix-vector-routing, ns3tcp, ns3wifi, olsr, openflow,
+  point-to-point, propagation, spectrum, stats, tap-bridge, test, tools,
+  topology-read, uan, virtual-net-device, visualizer, wifi, wimax
 
   PASS: TestSuite ns3-wifi-interference
   PASS: TestSuite histogram
diff --git a/wscript b/wscript
index bb0df68c8..f488df5fa 100644
--- a/wscript
+++ b/wscript
@@ -8,6 +8,7 @@ import optparse
 import os.path
 import re
 import shlex
+import textwrap
 
 # WAF modules
 import pproc as subprocess
@@ -708,11 +709,14 @@ def shutdown(ctx):
         return
     env = bld.env
 
-    # Print the enabled modules without the "ns3-" in their name.
+    # Get the sorted list of built modules without the "ns3-" in their name.
     modules_without_prefix =[mod[len('ns3-'):] for mod in env['NS3_ENABLED_MODULES']]
+    modules_without_prefix.sort()
+
+    # Print the list of built modules with lines wrapped at 70 characters.
     print
     print 'Modules built:'
-    print ', '.join(modules_without_prefix)
+    print textwrap.fill(', '.join(modules_without_prefix))
     print
 
     if Options.options.lcov_report: