diff --git a/.gitignore b/.gitignore
index 52a67b4a..767c89c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@ parser_yacc.h
 /locale/*/*/*.mo
 /locale/POTFILES
 /nbproject
+/openscad.pro.user
 /openscad
 /tests/openscad_nogui
 testdata/scad/features/import_dxf-tests.scad
diff --git a/boost.pri b/boost.pri
index 61ebd5e2..46fb7ecc 100644
--- a/boost.pri
+++ b/boost.pri
@@ -11,14 +11,20 @@ boost {
 
   # See https://svn.boost.org/trac/boost/ticket/6219
   macx: DEFINES += __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0
+
+  # MXE cross build
   CONFIG(mingw-cross-env) {
     DEFINES += BOOST_STATIC
     DEFINES += BOOST_THREAD_USE_LIB
     DEFINES += Boost_USE_STATIC_LIBS
     BOOST_LINK_FLAGS = -lboost_thread_win32-mt -lboost_program_options-mt -lboost_filesystem-mt -lboost_system-mt -lboost_regex-mt -lboost_chrono-mt
-  } 
+  }
 
-  isEmpty(BOOST_LINK_FLAGS):win* {
+  # MSYS2
+  isEmpty(BOOST_LINK_FLAGS):win32-g++ {
+    DEFINES += BOOST_STATIC
+    DEFINES += BOOST_THREAD_USE_LIB
+    DEFINES += Boost_USE_STATIC_LIBS
     BOOST_LINK_FLAGS = -lboost_thread-mt -lboost_program_options-mt -lboost_filesystem-mt -lboost_system-mt -lboost_regex-mt
   }