2 files changed, 4 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index c777713a..cd9c5606 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,9 @@ bugs --
 
 * --quit in root-daemon mode didn't work, fixed this.
 
+* Ensure that default server parameters get properly zeroed out after each
+  poll or skip statement in .fetchmailrc. 
+
 There are 188 people on the fetchmail-friends list.
 
 ------------------------------------------------------------------------------
diff --git a/rcfile_y.y b/rcfile_y.y
index 9da2769e..b23afdc7 100644
--- a/rcfile_y.y
+++ b/rcfile_y.y
@@ -79,6 +79,7 @@ statement	: SET BATCHLIMIT MAP NUMBER	{batchlimit = $4;}
  */
 		| define_server serverspecs	{prc_register(); prc_reset();}
 		| define_server serverspecs userspecs
+				{memset(&current,'\0',sizeof(current));}
 		;
 
 define_server	: POLL STRING	{current.server.names = (struct idlist *)NULL;