diff --git a/src/Make_cyg.mak b/src/Make_cyg.mak
index abd35a6..ff40548 100644
--- a/src/Make_cyg.mak
+++ b/src/Make_cyg.mak
@@ -485,13 +485,32 @@
 endif
 
 ##############################
+ifndef XPM
+ifeq ($(ARCH),i386)
+XPM = xpm/x86
+endif
+ifeq ($(ARCH),i486)
+XPM = xpm/x86
+endif
+ifeq ($(ARCH),i586)
+XPM = xpm/x86
+endif
+ifeq ($(ARCH),i686)
+XPM = xpm/x86
+endif
+ifeq ($(ARCH),x86-64)
+XPM = xpm/x64
+endif
+endif
+ifdef XPM
 ifneq ($(XPM),no)
 # Only allow XPM for a GUI build.
 DEFINES += -DFEAT_XPM_W32
-INCLUDES += -I$(XPM)/include
+INCLUDES += -I$(XPM)/include -I$(XPM)/../include
 EXTRA_OBJS += $(OUTDIR)/xpm_w32.o
 EXTRA_LIBS += -L$(XPM)/lib -lXpm
 endif
+endif
 
 ##############################
 EXE = gvim$(DEBUG_SUFFIX).exe
diff --git a/src/version.c b/src/version.c
index ec0e667..4b75a58 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    495,
+/**/
     494,
 /**/
     493,