diff --git a/conf.c b/conf.c
index d63b683..384fc56 100644
--- a/conf.c
+++ b/conf.c
@@ -148,7 +148,7 @@ static double max_offset;
 
 /* Maximum and minimum number of samples per source */
 static int max_samples = 0; /* no limit */
-static int min_samples = 0;
+static int min_samples = 6;
 
 /* Threshold for a time adjustment to be logged to syslog */
 static double log_change_threshold = 1.0;
diff --git a/doc/chrony.conf.adoc b/doc/chrony.conf.adoc
index d265044..4e8b929 100644
--- a/doc/chrony.conf.adoc
+++ b/doc/chrony.conf.adoc
@@ -178,7 +178,7 @@ for this computer and be able to respond in the interleaved mode.
 Target number of measurements to use for the regression algorithm which
 *chronyd* will try to maintain by adjusting the polling interval between
 *minpoll* and *maxpoll*. A higher target makes *chronyd* prefer shorter polling
-intervals. The default is 6 and a useful range is from 6 to 60.
+intervals. The default is 8 and a useful range is from 6 to 60.
 *port* _port_:::
 This option allows the UDP port on which the server understands NTP requests to
 be specified. For normal servers this option should not be required (the
@@ -568,7 +568,7 @@ useful range is 4 to 64.
 The *minsamples* directive sets the default minimum number of samples that
 *chronyd* should keep for each source. This setting can be overridden for
 individual sources in the <<server,*server*>> and <<refclock,*refclock*>>
-directives. The default value is 0. The useful range is 4 to 64.
+directives. The default value is 6. The useful range is 4 to 64.
 
 === Source selection
 
diff --git a/doc/faq.adoc b/doc/faq.adoc
index 41bf92e..35f0f38 100644
--- a/doc/faq.adoc
+++ b/doc/faq.adoc
@@ -160,7 +160,7 @@ are `minpoll`, `maxpoll`, `polltarget`, `maxdelay`, `maxdelayratio`,
 The first three options set the minimum and maximum allowed polling interval,
 and how should be the actual interval adjusted in the specified range. Their
 default values are 6 (64 seconds) for `minpoll`, 10 (1024 seconds) for
-`maxpoll` and 6 (samples) for `polltarget`. The default values should be used
+`maxpoll` and 8 (samples) for `polltarget`. The default values should be used
 for general servers on the Internet. With your own NTP servers or if have
 permission to poll some servers more frequently, setting these options for
 shorter polling intervals may significantly improve the accuracy of the system
diff --git a/srcparams.h b/srcparams.h
index 6825c36..bdf13a8 100644
--- a/srcparams.h
+++ b/srcparams.h
@@ -59,7 +59,7 @@ typedef struct {
 #define SRC_DEFAULT_MAXDELAYRATIO 0.0
 #define SRC_DEFAULT_MAXDELAYDEVRATIO 10.0
 #define SRC_DEFAULT_MINSTRATUM 0
-#define SRC_DEFAULT_POLLTARGET 6
+#define SRC_DEFAULT_POLLTARGET 8
 #define SRC_DEFAULT_MAXSOURCES 4
 #define SRC_DEFAULT_MINSAMPLES (-1)
 #define SRC_DEFAULT_MAXSAMPLES (-1)