2 files changed, 3 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 560bafdb..3b5cc19c 100644
--- a/NEWS
+++ b/NEWS
@@ -25,6 +25,7 @@ fetchmail-4.0.7 ()
 * Fixed a minor bug in handling of DNS errors in multidrop mode.
 * Added a `postconnect' analogous to `preconnect'.
 * Make `interval' count polls skipped because of interface or monitor option.
+* Fix UIDL option processing.
 
 There are 258 people on the fetchmail-friends list.
 
diff --git a/rcfile_y.y b/rcfile_y.y
index da9bb9eb..9a62c5b1 100644
--- a/rcfile_y.y
+++ b/rcfile_y.y
@@ -413,6 +413,7 @@ static void record_current(void)
     FLAG_FORCE(server.envelope);
     FLAG_FORCE(server.skip);
     FLAG_FORCE(server.dns);
+    FLAG_FORCE(server.uidl);
 
 #ifdef linux
     FLAG_FORCE(server.interface);
@@ -466,6 +467,7 @@ void optmerge(struct query *h2, struct query *h1)
     FLAG_MERGE(server.envelope);
     FLAG_MERGE(server.skip);
     FLAG_MERGE(server.dns);
+    FLAG_MERGE(server.uidl);
 
 #ifdef linux
     FLAG_MERGE(server.interface);