diff --git a/make.py b/make.py
index fa839639..56bf15da 100644
--- a/make.py
+++ b/make.py
@@ -1136,6 +1136,12 @@ def _create_batch_scripts_initial(self):
 
 :after_pyzo_conf
 
+rem ******************
+rem handle dying pipdeptree if included
+rem ******************
+set tmp_pyz=%WINPYDIR%\Lib\site-packages\pipdeptree.py
+if exist "%tmp_pyz%" set _PIP_USE_IMPORTLIB_METADATA=0
+
 
 rem ******************
 rem WinPython.ini part (removed from nsis)
@@ -1293,6 +1299,16 @@ def _create_batch_scripts_initial(self):
    gui = 'none'| Add-Content -Path $env:tmp_pyz
 }
 
+
+#####################
+###  handle dying pipdeptree if included
+#####################
+$env:tmp_pyz = "$env:WINPYDIR\Lib\site-packages\pipdeptree.py"
+if (Test-Path "$env:tmp_pyz") {
+   $env:_PIP_USE_IMPORTLIB_METADATA=0
+}
+
+
 #####################
 ### WinPython.ini part (removed from nsis)
 #####################