diff --git a/Makefile.in b/Makefile.in
index 5b445f6ea..c191cb3f8 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -744,10 +744,10 @@ all: startup.yss
 
 startup.yss: yap@EXEC_SUFFIX@ $(PL_SOURCES)
 	-rm -f startup.yss
-	echo "bootstrap('$(srcdir)/pl/init.yap'). module(user). qsave_program('startup.yss')." |  @PRE_INSTALL_ENV@ ./yap -b $(srcdir)/pl/boot.yap
+	echo "bootstrap('$(srcdir)/pl/init.yap'). module(user). qsave_program('startup.yss')." |  @PRE_INSTALL_ENV@ ./yap@EXEC_SUFFIX@ -b $(srcdir)/pl/boot.yap
 
 yap@EXEC_SUFFIX@: $(HEADERS) yap.o @YAPLIB@
-	$(MPI_CC) $(EXECUTABLE_CFLAGS) $(LDFLAGS) -o yap yap.o @YAPLIB@ $(LIBS)
+	$(MPI_CC) $(EXECUTABLE_CFLAGS) $(LDFLAGS) -o yap@EXEC_SUFFIX@ yap.o @YAPLIB@ $(LIBS)
 
 yap-win: yap-win@EXEC_SUFFIX@
 
@@ -755,7 +755,7 @@ yapwin: yap-win@EXEC_SUFFIX@
 
 yap-win@EXEC_SUFFIX@: $(PLCONS_OBJECTS) $(HEADERS) @YAPLIB@
 	(cd swi/console; $(MAKE))
-	$(MPI_CC) -municode -DUNICODE -D_UNICODE $(EXECUTABLE_CFLAGS) $(LDFLAGS) -Wl,-subsystem,windows -o yap-win $(PLCONS_OBJECTS) plterm.dll @YAPLIB@ $(LIBS) @MPILDF@
+	$(MPI_CC) -municode -DUNICODE -D_UNICODE $(EXECUTABLE_CFLAGS) $(LDFLAGS) -Wl,-subsystem,windows -o yap-win@EXEC_SUFFIX@ $(PLCONS_OBJECTS) plterm.dll @YAPLIB@ $(LIBS) @MPILDF@
 
 libYap.a: $(LIB_OBJECTS) 
 	-rm -f libYap.a
diff --git a/configure b/configure
index 309237355..d7f7bb702 100755
--- a/configure
+++ b/configure
@@ -5081,7 +5081,7 @@ fi
 
 
 
-if test "$target_os" = "cygwin"  -o "$target_os" = "mingw32"
+if test "$target_os" = "cygwin"  -o "$target_os" = "mingw32"  -o "$target_os" = "mingw64"
 then
   INSTALL_COMMAND=install_win32
   EXTRA_INCLUDES_FOR_WIN32="-I\$(srcdir)/packages/PLStream/windows"
@@ -5490,13 +5490,33 @@ fi
     yap_cv_readline=no
     if test "$prefix" = "NONE"
     then
-      if test "$target_win64" = yes
+      #mingw64
+      case "$build_os" in
+      *linux*)
+        if test "${WINEPREFIX}x" = x
+        then
+           SYSTEMDRIVE=$HOME/.wine/drive_c
+        else
+	   SYSTEMDRIVE="$WINEPREFIX"
+        fi
+        if test "$target_cpu" = "x86_64"
+        then
+         prefix="$SYSTEMDRIVE/Yap64"
+        else
+          prefix="$SYSTEMDRIVE/Yap"
+        fi
+ 	;;
+      **)
+      if test "$target_cpu" = "x86_64"
       then
         prefix="\${SYSTEMDRIVE}/Yap64"
       else
         prefix="\${SYSTEMDRIVE}/Yap"
       fi
+       ;;
+      esac
     fi
+    echo $prefix
     ENABLE_WINCONSOLE=""
   else
     ENABLE_WINCONSOLE="#"
@@ -11709,7 +11729,7 @@ else
 JAVA_TEST=Test.java
 CLASS_TEST=Test.class
 cat << \EOF > $JAVA_TEST
-/* #line 11712 "configure" */
+/* #line 11732 "configure" */
 public class Test {
 }
 EOF
@@ -11885,7 +11905,7 @@ EOF
 if uudecode$EXEEXT Test.uue; then
         ac_cv_prog_uudecode_base64=yes
 else
-        echo "configure: 11888: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
+        echo "configure: 11908: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
         echo "configure: failed file was:" >&5
         cat Test.uue >&5
         ac_cv_prog_uudecode_base64=no
@@ -12016,7 +12036,7 @@ else
 JAVA_TEST=Test.java
 CLASS_TEST=Test.class
 cat << \EOF > $JAVA_TEST
-/* #line 12019 "configure" */
+/* #line 12039 "configure" */
 public class Test {
 }
 EOF
@@ -12051,7 +12071,7 @@ JAVA_TEST=Test.java
 CLASS_TEST=Test.class
 TEST=Test
 cat << \EOF > $JAVA_TEST
-/* [#]line 12054 "configure" */
+/* [#]line 12074 "configure" */
 public class Test {
 public static void main (String args[]) {
         System.exit (0);
diff --git a/configure.in b/configure.in
index 4923343da..12f85529c 100755
--- a/configure.in
+++ b/configure.in
@@ -514,7 +514,7 @@ dnl Check for libraries.
 dnl mingw does not get along well with libm
 dnl cygnus and mingw32 also need wsock32 to use sockets.
 dnl
-if test "$target_os" = "cygwin"  -o "$target_os" = "mingw32"
+if test "$target_os" = "cygwin"  -o "$target_os" = "mingw32"  -o "$target_os" = "mingw64"
 then
   INSTALL_COMMAND=install_win32
   EXTRA_INCLUDES_FOR_WIN32="-I\$(srcdir)/packages/PLStream/windows"
@@ -542,13 +542,33 @@ then
     yap_cv_readline=no
     if test "$prefix" = "NONE"
     then
-      if test "$target_win64" = yes
+      #mingw64
+      case "$build_os" in
+      *linux*)
+        if test "${WINEPREFIX}x" = x
+        then
+           SYSTEMDRIVE=$HOME/.wine/drive_c
+        else
+	   SYSTEMDRIVE="$WINEPREFIX"
+        fi
+        if test "$target_cpu" = "x86_64"
+        then
+         prefix="$SYSTEMDRIVE/Yap64"
+        else
+          prefix="$SYSTEMDRIVE/Yap"
+        fi
+ 	;;
+      **)
+      if test "$target_cpu" = "x86_64"
       then
         prefix="\${SYSTEMDRIVE}/Yap64"
       else
         prefix="\${SYSTEMDRIVE}/Yap"
       fi
+       ;;
+      esac
     fi
+    echo $prefix
     ENABLE_WINCONSOLE=""   
   else
     ENABLE_WINCONSOLE="#"