diff --git a/Utilities/FLTK/fluid/Makefile b/Utilities/FLTK/fluid/Makefile-upstream
similarity index 100%
rename from Utilities/FLTK/fluid/Makefile
rename to Utilities/FLTK/fluid/Makefile-upstream
diff --git a/Utilities/FLTK/jpeg/Makefile b/Utilities/FLTK/jpeg/Makefile-upstream
similarity index 100%
rename from Utilities/FLTK/jpeg/Makefile
rename to Utilities/FLTK/jpeg/Makefile-upstream
diff --git a/Utilities/FLTK/png/Makefile b/Utilities/FLTK/png/Makefile-upstream
similarity index 100%
rename from Utilities/FLTK/png/Makefile
rename to Utilities/FLTK/png/Makefile-upstream
diff --git a/Utilities/FLTK/zlib/Makefile b/Utilities/FLTK/zlib/Makefile-upstream
similarity index 100%
rename from Utilities/FLTK/zlib/Makefile
rename to Utilities/FLTK/zlib/Makefile-upstream
diff --git a/Utilities/ITK/Utilities/nifti/Makefile b/Utilities/ITK/Utilities/nifti/Makefile-upstream
similarity index 100%
rename from Utilities/ITK/Utilities/nifti/Makefile
rename to Utilities/ITK/Utilities/nifti/Makefile-upstream
diff --git a/Utilities/ITK/Utilities/nifti/Testing/Makefile b/Utilities/ITK/Utilities/nifti/Testing/Makefile-upstream
similarity index 100%
rename from Utilities/ITK/Utilities/nifti/Testing/Makefile
rename to Utilities/ITK/Utilities/nifti/Testing/Makefile-upstream
diff --git a/Utilities/ITK/Utilities/nifti/examples/Makefile b/Utilities/ITK/Utilities/nifti/examples/Makefile-upstream
similarity index 100%
rename from Utilities/ITK/Utilities/nifti/examples/Makefile
rename to Utilities/ITK/Utilities/nifti/examples/Makefile-upstream
diff --git a/Utilities/ITK/Utilities/nifti/fsliolib/Makefile b/Utilities/ITK/Utilities/nifti/fsliolib/Makefile-upstream
similarity index 100%
rename from Utilities/ITK/Utilities/nifti/fsliolib/Makefile
rename to Utilities/ITK/Utilities/nifti/fsliolib/Makefile-upstream
diff --git a/Utilities/ITK/Utilities/nifti/nifticdf/Makefile b/Utilities/ITK/Utilities/nifti/nifticdf/Makefile-upstream
similarity index 100%
rename from Utilities/ITK/Utilities/nifti/nifticdf/Makefile
rename to Utilities/ITK/Utilities/nifti/nifticdf/Makefile-upstream
diff --git a/Utilities/ITK/Utilities/nifti/niftilib/Makefile b/Utilities/ITK/Utilities/nifti/niftilib/Makefile-upstream
similarity index 100%
rename from Utilities/ITK/Utilities/nifti/niftilib/Makefile
rename to Utilities/ITK/Utilities/nifti/niftilib/Makefile-upstream
diff --git a/Utilities/ITK/Utilities/nifti/utils/Makefile b/Utilities/ITK/Utilities/nifti/utils/Makefile-upstream
similarity index 100%
rename from Utilities/ITK/Utilities/nifti/utils/Makefile
rename to Utilities/ITK/Utilities/nifti/utils/Makefile-upstream
diff --git a/Utilities/ITK/Utilities/nifti/znzlib/Makefile b/Utilities/ITK/Utilities/nifti/znzlib/Makefile-upstream
similarity index 100%
rename from Utilities/ITK/Utilities/nifti/znzlib/Makefile
rename to Utilities/ITK/Utilities/nifti/znzlib/Makefile-upstream
diff --git a/Utilities/otbliblas/Makefile b/Utilities/otbliblas/Makefile-upstream
similarity index 100%
rename from Utilities/otbliblas/Makefile
rename to Utilities/otbliblas/Makefile-upstream
diff --git a/Utilities/otbliblas/apps/Makefile b/Utilities/otbliblas/apps/Makefile-upstream
similarity index 100%
rename from Utilities/otbliblas/apps/Makefile
rename to Utilities/otbliblas/apps/Makefile-upstream
diff --git a/Utilities/otbliblas/doc/Makefile b/Utilities/otbliblas/doc/Makefile-upstream
similarity index 100%
rename from Utilities/otbliblas/doc/Makefile
rename to Utilities/otbliblas/doc/Makefile-upstream
diff --git a/Utilities/otbliblas/src/Makefile b/Utilities/otbliblas/src/Makefile-upstream
similarity index 100%
rename from Utilities/otbliblas/src/Makefile
rename to Utilities/otbliblas/src/Makefile-upstream
diff --git a/Utilities/otbliblas/test/Makefile b/Utilities/otbliblas/test/Makefile-upstream
similarity index 100%
rename from Utilities/otbliblas/test/Makefile
rename to Utilities/otbliblas/test/Makefile-upstream
diff --git a/Utilities/otbliblas/test/unit/Makefile b/Utilities/otbliblas/test/unit/Makefile-upstream
similarity index 100%
rename from Utilities/otbliblas/test/unit/Makefile
rename to Utilities/otbliblas/test/unit/Makefile-upstream
diff --git a/Utilities/otbopenthreads/OpenThreads/src/OpenThreads/win32/Makefile b/Utilities/otbopenthreads/OpenThreads/src/OpenThreads/win32/Makefile-upstream
similarity index 100%
rename from Utilities/otbopenthreads/OpenThreads/src/OpenThreads/win32/Makefile
rename to Utilities/otbopenthreads/OpenThreads/src/OpenThreads/win32/Makefile-upstream
diff --git a/Utilities/otbsiftfast/Makefile b/Utilities/otbsiftfast/Makefile-upstream
similarity index 100%
rename from Utilities/otbsiftfast/Makefile
rename to Utilities/otbsiftfast/Makefile-upstream