diff --git a/config.c b/config.c
index ad63bba..854a703 100644
--- a/config.c
+++ b/config.c
@@ -445,6 +445,12 @@ static enum parser_result parse_global_setting(const char *option,
 			return r;
 		cfg->dds.kernel_leap = val;
 
+	} else if (!strcmp(option, "timeSource")) {
+		r = get_ranged_int(value, &val, 0x10, 0xfe);
+		if (r != PARSED_OK)
+			return r;
+		cfg->dds.time_source = val;
+
 	} else
 		return NOT_PARSED;
 
diff --git a/default.cfg b/default.cfg
index 6297925..e10d257 100644
--- a/default.cfg
+++ b/default.cfg
@@ -64,3 +64,4 @@ productDescription	;;
 revisionData		;;
 manufacturerIdentity	00:00:00
 userDescription		;
+timeSource		0xA0
diff --git a/ptp4l.8 b/ptp4l.8
index fb49b21..5a9e8b4 100644
--- a/ptp4l.8
+++ b/ptp4l.8
@@ -1,4 +1,4 @@
-.TH PTP4l 8 "November 2012" "linuxptp"
+.TH PTP4l 8 "July 2013" "linuxptp"
 .SH NAME
 ptp4l \- PTP Boundary/Ordinary Clock
 
@@ -350,6 +350,12 @@ one-second offset slowly by changing the clock frequency (unless the
 .B pi_offset_const
 option is set to correct such offset by stepping).
 Relevant only with software time stamping. The default is 1 (enabled).
+.TP
+.B timeSource
+The time source is a single byte code that gives an idea of the kind
+of local clock in use. The value is purely informational, having no
+effect on the outcome of the Best Master Clock algorithm, and is
+advertised when the clock becomes grand master.
 
 .SH TIME SCALE USAGE