diff --git a/BaseTools/BuildEnv b/BaseTools/BuildEnv
index 7c77454bf8..cb6403a52b 100755
--- a/BaseTools/BuildEnv
+++ b/BaseTools/BuildEnv
@@ -3,6 +3,7 @@
 # This file must be "sourced" not merely executed. For example: ". edksetup.sh"
 #
 # Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>
 # This program and the accompanying materials
 # are licensed and made available under the terms and conditions of the BSD License
 # which accompanies this distribution.  The full text of the license may be found at
@@ -215,7 +216,7 @@ CopySingleTemplateFile() {
 
   if [ -e $DST_FILENAME ]
   then
-    return
+    [ $RECONFIG != TRUE ] && return
   fi
 
   echo "Copying \$EDK_TOOLS_PATH/$SRC_FILENAME"
diff --git a/edksetup.sh b/edksetup.sh
index 7b542230f2..ec54f9ea40 100755
--- a/edksetup.sh
+++ b/edksetup.sh
@@ -24,6 +24,7 @@
 #
 
 SCRIPTNAME="edksetup.sh"
+RECONFIG=FALSE
 
 function HelpMsg()
 {
@@ -35,6 +36,9 @@ function HelpMsg()
   echo "Options: "
   echo "  --help, -h, -?        Print this help screen and exit."
   echo
+  echo "  --reconfig            Overwrite the WORKSPACE/Conf/*.txt files with the"
+  echo "                        template files from the BaseTools/Conf directory."
+  echo
   echo Please note: This script must be \'sourced\' so the environment can be changed.
   echo ". $SCRIPTNAME"
   echo "source $SCRIPTNAME"
@@ -121,6 +125,10 @@ do
       # Ignore argument for backwards compatibility
       shift
     ;;
+    --reconfig)
+      RECONFIG=TRUE
+      shift
+    ;;
     -?|-h|--help|*)
       HelpMsg
       break
@@ -136,4 +144,6 @@ fi
 
 SourceEnv
 
+unset SCRIPTNAME RECONFIG
+
 return $?