diff --git a/common/wscript b/common/wscript
index 860cbace..095a010e 100644
--- a/common/wscript
+++ b/common/wscript
@@ -142,6 +142,7 @@ def build(bld):
     clientlib.defines = 'HAVE_CONFIG_H'
     clientlib.use = uselib
     if bld.env['IS_WINDOWS']:
+         clientlib.env['cxxshlib_PATTERN'] = 'lib%s.dll'
          clientlib.install_path = '${BINDIR}'
     else:
          clientlib.install_path = '${LIBDIR}'
@@ -208,6 +209,7 @@ def build(bld):
     serverlib.target       = 'jackserver'
     serverlib.use = uselib
     if bld.env['IS_WINDOWS']:
+         serverlib.env['cxxshlib_PATTERN'] = 'lib%s.dll'
          serverlib.install_path = '${BINDIR}'
     else:
          serverlib.install_path = '${LIBDIR}'
@@ -303,6 +305,7 @@ def build(bld):
         netlib.target       = 'jacknet'
         netlib.use = ['SAMPLERATE', 'CELT', 'OPUS', 'PTHREAD']
         if bld.env['IS_WINDOWS']:
+             netlib.env['cxxshlib_PATTERN'] = 'lib%s.dll'
              netlib.install_path = '${BINDIR}'
              netlib.use += ['WS2_32', 'WINMM']
         elif bld.env['IS_MACOSX']:
diff --git a/windows/JackSystemDeps_os.h b/windows/JackSystemDeps_os.h
index b2085fef..07f1bdfb 100644
--- a/windows/JackSystemDeps_os.h
+++ b/windows/JackSystemDeps_os.h
@@ -53,5 +53,18 @@
 #define snprintf _snprintf
 #endif
 
+inline int setenv(const char* name, const char* value, int overwrite)
+{
+	if (overwrite == 0 && getenv(name) != NULL) {
+		return 0;
+	}
+	return _putenv_s(name, value);
+}
+
+inline int unsetenv(const char* name)
+{
+	return _putenv_s(name, "");
+}
+
 #endif
 
diff --git a/wscript b/wscript
index ab16d6e7..2a1708bb 100644
--- a/wscript
+++ b/wscript
@@ -453,7 +453,7 @@ def detect_platform(conf):
         ('IS_LINUX',   'Linux',   ['gnu0', 'gnukfreebsd', 'linux', 'posix']),
         ('IS_MACOSX',  'MacOS X', ['darwin']),
         ('IS_SUN',     'SunOS',   ['sunos']),
-        ('IS_WINDOWS', 'Windows', ['cygwin', 'win32'])
+        ('IS_WINDOWS', 'Windows', ['cygwin', 'msys', 'win32'])
     ]
 
     for key,name,strings in platforms:
@@ -872,7 +872,7 @@ def build_drivers(bld):
         'windows/portaudio/JackPortAudioDriver.cpp',
     ]
 
-    winmme_driver_src = [
+    winmme_src = [
         'windows/winmme/JackWinMMEDriver.cpp',
         'windows/winmme/JackWinMMEInputPort.cpp',
         'windows/winmme/JackWinMMEOutputPort.cpp',