diff --git a/src/channel.c b/src/channel.c
index b99b3a9..69bbff2 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -2277,7 +2277,7 @@
 	{
 	    int timeout;
 #ifdef MSWIN
-	    timeout = GetTickCount() > chanpart->ch_deadline;
+	    timeout = (int)(GetTickCount() - chanpart->ch_deadline) > 0;
 #else
 	    {
 		struct timeval now_tv;
diff --git a/src/version.c b/src/version.c
index f8d1762..97414a0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    639,
+/**/
     638,
 /**/
     637,