diff --git a/.cvsignore b/.cvsignore
index b144959..cd83ec4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,2 @@
-fetchmail-6.3.5.tar.bz2
-fetchmail-6.3.5.tar.bz2.asc
-fm635-daemon-logfile.patch
+fetchmail-6.3.6.tar.bz2
+fetchmail-6.3.6.tar.bz2.asc
diff --git a/fetchmail.spec b/fetchmail.spec
index a3c0e3f..1348f9d 100644
--- a/fetchmail.spec
+++ b/fetchmail.spec
@@ -3,12 +3,11 @@
 
 Summary: A remote mail retrieval and forwarding utility
 Name: fetchmail
-Version: 6.3.5
-Release: 1
+Version: 6.3.6
+Release: 1%{?dist}
 Requires: smtpdaemon
 Source0: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2
 Source1: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2.asc
-Source2: http://download.berlios.de/fetchmail/fm635-daemon-logfile.patch
 Patch0: fetchmail-6.2.5-addrconf.patch
 URL: http://fetchmail.berlios.de/
 License: GPL
@@ -46,7 +45,6 @@ need to have Python and Tk installed in order to use fetchmailconf.
 
 %prep
 %setup -q
-patch -p0 < %{SOURCE2}
 %patch0 -p1 -b .addrconf
 
 %build
@@ -85,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sat Jan  6 2007 Miloslav Trmac <mitr@redhat.com> - 6.3.6-1
+- Update to fetchmail-6.3.6 (CVE-2006-5867, CVE-2006-5974)
+
 * Wed Nov  1 2006 Miloslav Trmac <mitr@redhat.com> - 6.3.5-1
 - Update to fetchmail-6.3.5
 - Fix some rpmlint warnings
diff --git a/sources b/sources
index 34534c6..9ebe81a 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-e8dc5cd8e80677bb60e397d6171d12ec  fetchmail-6.3.5.tar.bz2
-3716001e8e8c6dc54b58dfd571151ff0  fetchmail-6.3.5.tar.bz2.asc
-4b37403e91d2732902f33fa15ab43a68  fm635-daemon-logfile.patch
+4fab7ca100ca36e41a2e8dbf5b32a3cf  fetchmail-6.3.6.tar.bz2
+2835d60ee1eaefcac5f6af5728544e60  fetchmail-6.3.6.tar.bz2.asc