diff --git a/bin/autoproj_bootstrap b/bin/autoproj_bootstrap
index 39bcda2c..bdf5f1bb 100644
--- a/bin/autoproj_bootstrap
+++ b/bin/autoproj_bootstrap
@@ -16,6 +16,11 @@ module Autobuild
     def self.macos?
         @macos
     end
+
+    @msys =  RbConfig::CONFIG["host_os"] =~%r!(msys)!
+    def self.msys?
+        @msys
+    end
 end
 
 require 'yaml'
@@ -358,6 +363,14 @@ module Autoproj
             end
         end
 
+        def import_log_enabled?
+            get('import_log_enabled', true)
+        end
+
+        def import_log_enabled=(value)
+            set('import_log_enabled', !!value)
+        end
+
         def ruby_executable
             @ruby_executable ||= OSDependencies.autodetect_ruby_program
         end
@@ -616,7 +629,7 @@ module Autoproj
                     end
                 end
                 
-                sudo = Autobuild.tool_in_path('sudo')
+                sudo = Autobuild.tool_in_path('sudo') if with_root
                 Tempfile.open('osdeps_sh') do |io|
                     io.puts "#! /bin/bash"
                     io.puts GAIN_ROOT_ACCESS % [sudo] if with_root
@@ -858,6 +871,10 @@ fi
                 super(['pacman'], true,
                         "pacman -Sy --needed '%s'",
                         "pacman -Sy --needed --noconfirm '%s'")
+                super(['pacman-msys'], true,
+                        "pacman -Sy --needed '%s'",
+                        "pacman -Sy --needed --noconfirm '%s'",
+                        false)
             end
         end
 
@@ -870,6 +887,15 @@ fi
                         "emerge --noreplace '%s'")
             end
         end
+    # Package manager interface for systems that use pkg (i.e. FreeBSD) as
+        # their package manager
+        class PkgManager < ShellScriptManager
+            def initialize
+                super(['pkg'], true,
+                        "pkg install -y '%s'",
+                        "pkg install -y '%s'")
+            end
+        end
 
         #Package manger for OpenSuse and Suse (untested)
         class ZypperManager < ShellScriptManager
@@ -1483,7 +1509,9 @@ fi
             PackageManagers::YumManager,
             PackageManagers::PortManager,
             PackageManagers::ZypperManager,
-            PackageManagers::PipManager]
+            PackageManagers::PipManager ,
+            PackageManagers::PkgManager,
+            PackageManagers::PacmanManager]
         
         # Mapping from OS name to package manager name
         #
@@ -1503,7 +1531,9 @@ fi
             'fedora' => 'yum',
             'macos-port' => 'macports',
             'macos-brew' => 'brew',
-            'opensuse' => 'zypper'
+            'opensuse' => 'zypper',
+            'freebsd' => 'pkg',
+            'msys' => 'pacman-msys'
         }
 
         # The information contained in the OSdeps files, as a hash
@@ -1705,11 +1735,16 @@ fi
                 [[*managers, 'darwin'], [version.strip]]
             elsif Autobuild.windows?
                 [['windows'], []]
+            elsif Autobuild.msys?
+                [['msys'], []]
             elsif File.exists?('/etc/SuSE-release')
                 version = File.read('/etc/SuSE-release').strip
                 version =~/.*VERSION\s+=\s+([^\s]+)/
                 version = $1
                 [['opensuse'], [version.strip]]
+            elsif Autobuild.freebsd? 
+        version = `uname -r`.strip.split("-")[0]
+        [['freebsd'],[version]]
             end
         end
 
@@ -1858,6 +1893,20 @@ fi
 
         class InvalidRecursiveStatement < Autobuild::Exception; end
 
+        # Return the path to the osdeps name for a given package name while
+        # accounting for package aliases
+        #
+        # returns an array contain the path starting with name and
+        # ending at the resolved name
+        def self.resolve_name(name)
+            path = [ name ]
+            while OSDependencies.aliases.has_key?(name)
+                name = OSDependencies.aliases[name]
+                path << name
+            end
+            path
+        end
+
         # Return the list of packages that should be installed for +name+
         #
         # The following two simple return values are possible:
@@ -1876,9 +1925,8 @@ fi
         # name and version. The package list might be empty even if status ==
         # FOUND_PACKAGES, for instance if the ignore keyword is used.
         def resolve_package(name)
-            while OSDependencies.aliases.has_key?(name)
-                name = OSDependencies.aliases[name]
-            end
+            path = OSDependencies.resolve_name(name)
+            name = path.last
 
             os_names, os_versions = OSDependencies.operating_system
             os_names = os_names.dup
@@ -2099,7 +2147,8 @@ fi
             dependencies.each do |name|
                 result = resolve_package(name)
                 if !result
-                    raise MissingOSDep.new, "there is no osdeps definition for #{name}"
+                    path = OSDependencies.resolve_name(name)
+                    raise MissingOSDep.new, "there is no osdeps definition for #{path.last} (search tree: #{path.join("->")})"
                 end
 
                 if result.empty?
@@ -2608,6 +2657,14 @@ module Autoproj
     def self.create_symlink(from, to)
         if Autobuild.windows?
             Dir.create_junction(to, from)
+        elsif Autobuild.msys?
+            begin
+                #msys created a copy instead of a link
+                FileUtils.ln_sf from, to
+            rescue Errno::EEXIST
+                FileUtils.rm_rf to
+                FileUtils.ln_sf from, to
+            end
         else
             FileUtils.ln_sf from, to
         end
@@ -2927,8 +2984,12 @@ build-essential:
   - glibc-devel
   darwin: ignore
   opensuse:
-  - '@devel_C_C++'
+  - "@devel_C_C++"
   - gcc-c++
+  msys:
+  - mingw-w64-x86_64-gcc
+  - mingw-w64-x86_64-pkg-config
+  default: clang
 autobuild:
 - gem: autobuild
 - osdep: readline
@@ -2941,6 +3002,7 @@ readline:
   opensuse: readline-devel
   arch: core/readline
   macos-brew: readline
+  msys: libreadline-devel
   default: ignore
 git:
   debian:
@@ -2953,6 +3015,8 @@ git:
   macos-port: git
   macos-brew: git
   opensuse: git
+  freebsd: git
+  msys: git
 hg:
   debian,ubuntu: mercurial
   gentoo: dev-vcs/mercurial
@@ -2960,6 +3024,8 @@ hg:
   fedora: mercurial
   darwin: mercurial
   opensuse: mercurial
+  freebsd: mercurial
+  msys: mercurial
 svn:
   debian,ubuntu: subversion
   gentoo: dev-util/subversion
@@ -2967,6 +3033,8 @@ svn:
   fedora: subversion
   darwin: subversion
   opensuse: subversion
+  freebsd: subversion
+  msys: subversion
 cmake:
   debian,ubuntu: cmake
   gentoo: dev-util/cmake
@@ -2974,6 +3042,8 @@ cmake:
   fedora: cmake
   darwin: cmake
   opensuse: cmake
+  freebsd: cmake
+  msys: mingw-w64-x86_64-cmake
 autotools:
   debian,ubuntu:
   - automake
@@ -2993,6 +3063,12 @@ autotools:
   opensuse:
   - automake
   - autoconf
+  freebsd:
+  - automake
+  - autoconf
+  msys:
+  - automake
+  - autoconf
 archive:
   debian,ubuntu:
   - tar
@@ -3014,18 +3090,28 @@ archive:
   opensuse:
   - tar
   - unzip
+  msys:
+  - tar
+  - unzip
+  default: ignore
 cvs:
   debian,ubuntu: cvs
   fedora: cvs
   darwin: cvs
   arch: cvs
   opensuse: cvs
+  freebsd: cvs
+  msys: cvs
 pip:
   debian,ubuntu: python-pip
   arch: python2-pip
   opensuse: python-pip
   fedora: python-pip
+  freebsd: pip
+  msys: mingw-w64-x86_64-python2-pip
 sudo:
+  macos-brew: ignore
+  msys: ignore
   default: sudo
 
 EODEFS
diff --git a/bin/autoproj_bootstrap.in b/bin/autoproj_bootstrap.in
index 7769a23b..57b99d55 100644
--- a/bin/autoproj_bootstrap.in
+++ b/bin/autoproj_bootstrap.in
@@ -16,6 +16,11 @@ module Autobuild
     def self.macos?
         @macos
     end
+
+    @msys =  RbConfig::CONFIG["host_os"] =~%r!(msys)!
+    def self.msys?
+        @msys
+    end
 end
 
 require 'yaml'
diff --git a/lib/autoproj/default.osdeps b/lib/autoproj/default.osdeps
index a5c02eed..d8d2e3b6 100644
--- a/lib/autoproj/default.osdeps
+++ b/lib/autoproj/default.osdeps
@@ -80,6 +80,12 @@ ruby21:
       - gem: rake
   default: ignore # we assume that if the user has a ruby 2.1 runtime, it is usable
 
+ruby22:
+  default: ignore # we assume that if the user has a ruby 2.2 runtime, it is usable
+
+ruby23:
+  default: ignore # we assume that if the user has a ruby 2.3 runtime, it is usable
+  
 build-essential:
   debian,ubuntu: build-essential
   gentoo: ignore
@@ -87,6 +93,9 @@ build-essential:
   fedora: ["gcc-c++", make, glibc-devel]
   darwin: ignore
   opensuse: ["@devel_C_C++", "gcc-c++"]
+  msys:
+    - mingw-w64-x86_64-gcc
+    - mingw-w64-x86_64-pkg-config
   default: clang
 
 autobuild:
@@ -102,6 +111,7 @@ readline:
   opensuse: readline-devel
   arch: core/readline
   macos-brew: readline
+  msys: libreadline-devel
   default: ignore
 
 # The following definitions are for the VCS and build systems
@@ -117,6 +127,7 @@ git:
   macos-brew: git
   opensuse: git
   freebsd: git
+  msys: git
 
 hg:
   debian,ubuntu: mercurial
@@ -126,6 +137,7 @@ hg:
   darwin: mercurial
   opensuse: mercurial
   freebsd: mercurial
+  msys: mercurial
 
 svn:
   debian,ubuntu: subversion
@@ -135,6 +147,7 @@ svn:
   darwin: subversion
   opensuse: subversion
   freebsd: subversion
+  msys: subversion
 
 cmake:
   debian,ubuntu: cmake
@@ -144,6 +157,7 @@ cmake:
   darwin: cmake
   opensuse: cmake
   freebsd: cmake
+  msys: mingw-w64-x86_64-cmake
 
 autotools:
   debian,ubuntu:
@@ -167,6 +181,9 @@ autotools:
   freebsd:
   - automake
   - autoconf
+  msys:
+  - automake
+  - autoconf
 
 archive:
   debian,ubuntu:
@@ -189,6 +206,9 @@ archive:
   opensuse:
   - tar
   - unzip
+  msys:
+  - tar
+  - unzip
   default: ignore
 
 cvs:
@@ -198,6 +218,7 @@ cvs:
   arch: cvs
   opensuse: cvs
   freebsd: cvs
+  msys: cvs
 
 pip:
   debian,ubuntu: python-pip
@@ -205,9 +226,11 @@ pip:
   opensuse: python-pip
   fedora: python-pip
   freebsd: pip
+  msys: mingw-w64-x86_64-python2-pip
 
 sudo:
   macos-brew: ignore
+  msys: ignore
   default: sudo
 
 # vim: expandtab
diff --git a/lib/autoproj/osdeps.rb b/lib/autoproj/osdeps.rb
index 3684edf1..2973bf08 100644
--- a/lib/autoproj/osdeps.rb
+++ b/lib/autoproj/osdeps.rb
@@ -101,7 +101,7 @@ def self.execute(script, with_locking, with_root)
                     end
                 end
                 
-                sudo = Autobuild.tool_in_path('sudo')
+                sudo = Autobuild.tool_in_path('sudo') if with_root
                 Tempfile.open('osdeps_sh') do |io|
                     io.puts "#! /bin/bash"
                     io.puts GAIN_ROOT_ACCESS % [sudo] if with_root
@@ -343,6 +343,10 @@ def initialize
                 super(['pacman'], true,
                         "pacman -Sy --needed '%s'",
                         "pacman -Sy --needed --noconfirm '%s'")
+                super(['pacman-msys'], true,
+                        "pacman -Sy --needed '%s'",
+                        "pacman -Sy --needed --noconfirm '%s'",
+                        false)
             end
         end
 
@@ -355,7 +359,7 @@ def initialize
                         "emerge --noreplace '%s'")
             end
         end
-	# Package manager interface for systems that use pkg (i.e. FreeBSD) as
+    # Package manager interface for systems that use pkg (i.e. FreeBSD) as
         # their package manager
         class PkgManager < ShellScriptManager
             def initialize
@@ -978,7 +982,8 @@ def load_default
             PackageManagers::PortManager,
             PackageManagers::ZypperManager,
             PackageManagers::PipManager ,
-            PackageManagers::PkgManager]
+            PackageManagers::PkgManager,
+            PackageManagers::PacmanManager]
         
         # Mapping from OS name to package manager name
         #
@@ -999,7 +1004,8 @@ def load_default
             'macos-port' => 'macports',
             'macos-brew' => 'brew',
             'opensuse' => 'zypper',
-            'freebsd' => 'pkg'
+            'freebsd' => 'pkg',
+            'msys' => 'pacman-msys'
         }
 
         # The information contained in the OSdeps files, as a hash
@@ -1201,14 +1207,16 @@ def self.guess_operating_system
                 [[*managers, 'darwin'], [version.strip]]
             elsif Autobuild.windows?
                 [['windows'], []]
+            elsif Autobuild.msys?
+                [['msys'], []]
             elsif File.exists?('/etc/SuSE-release')
                 version = File.read('/etc/SuSE-release').strip
                 version =~/.*VERSION\s+=\s+([^\s]+)/
                 version = $1
                 [['opensuse'], [version.strip]]
             elsif Autobuild.freebsd? 
-		version = `uname -r`.strip.split("-")[0]
-		[['freebsd'],[version]]
+        version = `uname -r`.strip.split("-")[0]
+        [['freebsd'],[version]]
             end
         end
 
diff --git a/lib/autoproj/system.rb b/lib/autoproj/system.rb
index 9b5d4e40..94bd4564 100644
--- a/lib/autoproj/system.rb
+++ b/lib/autoproj/system.rb
@@ -6,6 +6,14 @@ class UserError < RuntimeError; end
     def self.create_symlink(from, to)
         if Autobuild.windows?
             Dir.create_junction(to, from)
+        elsif Autobuild.msys?
+            begin
+                #msys created a copy instead of a link
+                FileUtils.ln_sf from, to
+            rescue Errno::EEXIST
+                FileUtils.rm_rf to
+                FileUtils.ln_sf from, to
+            end
         else
             FileUtils.ln_sf from, to
         end
diff --git a/lib/autoproj/version.rb b/lib/autoproj/version.rb
index 070a730a..15c3bae2 100644
--- a/lib/autoproj/version.rb
+++ b/lib/autoproj/version.rb
@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.13.1"
+    VERSION = "1.13.5"
 end