diff --git a/tools/winemaker b/tools/winemaker
index 200d5ce5301..484cf723baf 100755
--- a/tools/winemaker
+++ b/tools/winemaker
@@ -1810,7 +1810,11 @@ sub search_from($$)
       $real_path.="./";
     } elsif ($component eq "..") {
       # Go up one level
-      $dirname=dirname($dirname) . "/";
+      if ($dirname =~ /\.\.\/$/) {
+        $dirname.="../";
+      } else {
+        $dirname=dirname($dirname) . "/";
+      }
       $real_path.="../";
     } else {
       # The file/directory may have been renamed before. Also try to