diff --git a/samples/main-propagation-loss.cc b/samples/main-propagation-loss.cc
new file mode 100644
index 000000000..6d8d7f663
--- /dev/null
+++ b/samples/main-propagation-loss.cc
@@ -0,0 +1,67 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2007 INRIA
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
+ */
+#include "ns3/propagation-loss-model.h"
+#include "ns3/default-value.h"
+#include "ns3/static-mobility-model.h"
+
+using namespace ns3;
+
+static void
+PrintOne (double minTxpower, double maxTxpower, double stepTxpower, double min, double max, double step)
+{
+  Ptr<StaticMobilityModel> a = Create<StaticMobilityModel> ();
+  Ptr<StaticMobilityModel> b = Create<StaticMobilityModel> ();
+  Ptr<PropagationLossModel> model = PropagationLossModel::CreateDefault ();
+
+  a->Set (Position (0.0, 0.0, 0.0));
+  for (double x = min; x < max; x+= step)
+    {
+      b->Set (Position (x, 0.0, 0.0));
+      std::cout << x << " ";
+      for (double txpower = minTxpower; txpower < maxTxpower; txpower += stepTxpower)
+        {
+          double rxPowerDbm = model->GetRxPower (txpower, a, b);
+          std::cout << rxPowerDbm << " ";
+        }
+      std::cout << std::endl;
+    }
+}
+
+int main (int argc, char *argv[])
+{
+
+#if 0
+  DefaultValue::Bind ("PropagationLossModelType", "Friis");
+  DefaultValue::Bind ("FriisPropagationLossLambda", "0.6");
+  DefaultValue::Bind ("FriisPropagationLossSystemLoss", "1.0");
+
+  PrintOne (10, 0, 1000, 5);
+#endif
+
+  DefaultValue::Bind ("PropagationLossModelType", "LogDistance");
+  DefaultValue::Bind ("LogDistancePropagationLossReferenceDistance", "1.0");
+  DefaultValue::Bind ("LogDistancePropagationLossReferenceType", "Random");
+  DefaultValue::Bind ("RandomPropagationLossDistribution", "Constant:10");
+  DefaultValue::Bind ("LogDistancePropagationLossExponent", "4");
+
+  PrintOne (-10, 20, 5, 0, 10000, 2);
+
+  return 0;
+}
diff --git a/samples/wscript b/samples/wscript
index 60772e80d..c8a97de52 100644
--- a/samples/wscript
+++ b/samples/wscript
@@ -50,4 +50,8 @@ def build(bld):
                                  ['core', 'simulator', 'mobility'])
     obj.source = 'main-random-walk.cc'
 
+    obj = bld.create_ns3_program('main-propagation-loss',
+                                 ['core', 'simulator', 'mobility', 'wifi'])
+    obj.source = 'main-propagation-loss.cc'
+
 
diff --git a/src/devices/wifi/wscript b/src/devices/wifi/wscript
index 47a8e52e2..8374927dc 100644
--- a/src/devices/wifi/wscript
+++ b/src/devices/wifi/wscript
@@ -36,6 +36,7 @@ def build(bld):
         ]
     headers = bld.create_obj('ns3header')
     headers.source = [
+        'propagation-loss-model.h',
         'wifi-net-device.h',
         'wifi-channel.h',
         'wifi-mode.h',