diff --git a/BUILD b/BUILD
index 7240cf803..4cf112c0e 100644
--- a/BUILD
+++ b/BUILD
@@ -29,6 +29,10 @@ Example: scons cflags="-O3 -ffast-math"
 Example: scons cxxflags="-O3 -ffast-math"
 - ldflags: flags for the linker:
 Example: scons ldflags="-L/foo -L/bar"
+- cc: the C compiler to use:
+Example: scons cc=gcc-4.0
+- cxx: the C++ compiler to use:
+Example: scons cxx=g++-4.0
 - high-precision-as-double: set to 'y' to make sure that the
   high-precision arithmetics performed by the Time class on
   behalf of the user will use doubles. By default, the code
diff --git a/SConstruct b/SConstruct
index 8e7277b80..d070a5315 100644
--- a/SConstruct
+++ b/SConstruct
@@ -4,7 +4,7 @@ import build
 
 ns3 = build.Ns3()
 ns3.build_dir = 'build-dir'
-ns3.version = '0.0.1'
+ns3.version = '0.2'
 ns3.name = 'ns3'
 ns3.doxygen_config = os.path.join('doc', 'doxygen.conf')
 ns3.add_extra_dist(os.path.join('doc', 'main.txt'))
@@ -277,12 +277,11 @@ inode.add_headers ([
     'udp-header.h',
     'ipv4-checksum.h',
     'arp-header.h',
-    'arp-cache-cache.h',
+    'arp-cache.h',
     'arp.h',
     'ipv4-loopback-interface.h',
     'l3-demux.h',
     'header-utils.h',
-    'queue.h',
     'arp-ipv4-interface.h',
     'udp-socket.h',
     'udp.h',
@@ -318,9 +317,6 @@ p2p.add_sources ([
     'p2p-channel.cc',
     'p2p-topology.cc',
     ])
-p2p.add_headers ([
-    'propagator.h',
-    ])
 p2p.add_inst_headers ([
     'p2p-net-device.h',
     'p2p-channel.h',
diff --git a/build.py b/build.py
index 5987df284..e7b871dcc 100644
--- a/build.py
+++ b/build.py
@@ -350,6 +350,12 @@ class Ns3:
             env = Environment(ENV=os.environ)
             debug_flags = ['-W1', '-GX', '-EHsc', '-D_DEBUG', '/MDd']
             opti_flags = ['-O2', '-EHsc', '-DNDEBUG', '/MD']
+        cc = ARGUMENTS.get ('cc', '')
+        cxx = ARGUMENTS.get ('cxx', '')
+        if cc != '':
+            env.Replace (CC = cc)
+        if cxx != '':
+            env.Replace (CXX = cxx)
         env.Append(CCFLAGS = common_flags, 
                     CPPDEFINES = ['RUN_SELF_TESTS'], 
                     TARFLAGS = '-c -z',