diff --git a/Packaging/Files/uninstall_otb.bat b/Packaging/Files/uninstall_otb.bat
index 257d2ec730d60a5c20ae5aac8297f33a74096239..3389fd15452785a39f3c88c28a14db8cc70ade30 100644
--- a/Packaging/Files/uninstall_otb.bat
+++ b/Packaging/Files/uninstall_otb.bat
@@ -1,41 +1,53 @@
-:: 
-:: Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
-::
-:: This file is part of Orfeo Toolbox
-:: 
-::    https://www.orfeo-toolbox.org/
-::
-:: Licensed under the Apache License, Version 2.0 (the "License");
-:: you may not use this file except in compliance with the License.
-:: You may obtain a copy of the License at
-::
-::    http://www.apache.org/licenses/LICENSE-2.0
-::
-:: Unless required by applicable law or agreed to in writing, software
-:: distributed under the License is distributed on an "AS IS" BASIS,
-:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-:: See the License for the specific language governing permissions and
-:: limitations under the License.
-
-:: script to uninstall OTB
-
-setlocal
-set CUR_DIR=%~dp0
-cd %CUR_DIR%..
-set MY_INSTALL_DIR=%cd%
-del /S /Q %MY_INSTALL_DIR%\include\OTB* || exit 1
-del /S /Q %MY_INSTALL_DIR%\lib\cmake\OTB* || exit 1
-del /S /Q %MY_INSTALL_DIR%\lib\otb* || exit 1
-del /S /Q %MY_INSTALL_DIR%\lib\python\*otbApplication.* || exit 1
-del /S /Q %MY_INSTALL_DIR%\lib\python3\*otbApplication.* || exit 1
-del /S /Q %MY_INSTALL_DIR%\lib\java\org.otb.application.jar || exit 1
-del /S /Q %MY_INSTALL_DIR%\bin\otb* || exit 1
-del /S /Q %MY_INSTALL_DIR%\bin\monteverdi.exe || exit 1
-del /S /Q %MY_INSTALL_DIR%\bin\mapla.exe || exit 1
-del /S /Q %MY_INSTALL_DIR%\mapla.bat || exit 1
-del /S /Q %MY_INSTALL_DIR%\monteverdi.bat || exit 1
-del /S /Q %MY_INSTALL_DIR%\share\OTB* || exit 1
-del /S /Q "%MY_INSTALL_DIR%\OTB Project.zip" || exit 1
-endlocal
-
-
+@echo off
+:: 
+:: Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
+::
+:: This file is part of Orfeo Toolbox
+:: 
+::    https://www.orfeo-toolbox.org/
+::
+:: Licensed under the Apache License, Version 2.0 (the "License");
+:: you may not use this file except in compliance with the License.
+:: You may obtain a copy of the License at
+::
+::    http://www.apache.org/licenses/LICENSE-2.0
+::
+:: Unless required by applicable law or agreed to in writing, software
+:: distributed under the License is distributed on an "AS IS" BASIS,
+:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+:: See the License for the specific language governing permissions and
+:: limitations under the License.
+
+:: script to uninstall OTB
+
+setlocal
+cd %~dp0%..
+
+echo - Clean include\OTB*
+for /f %%i in ('dir /b include\OTB*') do rd /S /Q include\%%i
+
+echo - Clean lib\cmake\OTB*
+for /f %%i in ('dir /b lib\cmake\OTB*') do rd /S /Q lib\cmake\%%i
+
+echo - Clean share\OTB*
+for /f %%i in ('dir /b share\OTB*') do rd /S /Q share\%%i
+
+echo - Clean lib\otb
+rd /S /Q lib\otb
+
+del /S /Q lib\otb*
+del /S /Q lib\python\*otbApplication.* || exit 1
+del /S /Q lib\python3\*otbApplication.* || exit 1
+del /S /Q lib\java\org.otb.application.jar || exit 1
+del /S /Q bin\otb* || exit 1
+del /S /Q bin\monteverdi.exe || exit 1
+del /S /Q bin\mapla.exe || exit 1
+del /S /Q mapla.bat || exit 1
+del /S /Q monteverdi.bat || exit 1
+del /S /Q otbenv.* || exit 1
+del /S /Q start_devenv.bat || exit 1
+del /S /Q "OTB Project.zip" || exit 1
+
+echo OTB is now uninstalled from %cd%
+
+endlocal
diff --git a/Packaging/Files/uninstall_otb.sh b/Packaging/Files/uninstall_otb.sh
index 94ee967a48c3a0f98fad3ce8bb9ba9f57a0c13a5..1b5030c58adc09ee1e21c653941fc263397bddd4 100755
--- a/Packaging/Files/uninstall_otb.sh
+++ b/Packaging/Files/uninstall_otb.sh
@@ -22,8 +22,10 @@ set -e
 rm -fr OUT_DIR/include/OTB-*
 rm -f OUT_DIR/lib/{libotb*,libOTB*}
 rm -fr OUT_DIR/lib/{otb,python/*otbApplication*,python3/*otbApplication*,java/org.otb.application.jar}
+rm -fr OUT_DIR/lib/cmake/OTB-*
 rm -fr OUT_DIR/share/OTB*
 rm -fv OUT_DIR/bin/{otb*,monteverdi,mapla}
 rm -fv OUT_DIR/{mapla.sh,monteverdi.sh}
+rm -fv OUT_DIR/otbenv.*
 
 echo "OTB is now uninstalled from OUT_DIR"