diff --git a/appveyor-dev.yml b/appveyor-dev.yml
index 83eddc44db7..5b092d56f8a 100644
--- a/appveyor-dev.yml
+++ b/appveyor-dev.yml
@@ -9,6 +9,9 @@ environment:
   PYTHON: "C:\\Python35"
   access_token:
     secure: VMFbecLLHzDq/09YDPbcM0VDDSwwgY57vr5GXK6cZZ4Ti/Xs5RZoylzV8MMr1350
+  extension_repo: "https://github.com/Azure/azure-cli-extensions"
+  extension_branch: "master"
+  extentsion_folder: "_ext"
 
 install:
   - SET PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%
@@ -42,11 +45,20 @@ build_script:
       $fileCommitMap | ConvertTo-Json | Out-File "$env:APPVEYOR_BUILD_FOLDER\doc\sphinx\doc_commit_map.json"
   - cd doc\sphinx 
   - make xmlwithversion
+  - git clone --depth 5 -q --branch=%extension_branch% %extension_repo% %TEMP%\azure-cli-extensions
+  - cd %TEMP%\azure-cli-extensions
+  - virtualenv --no-site-packages venv
+  - .\venv\Scripts\activate
+  - pip install azure-cli sphinx==1.7.0
+  - mkdir xmls
+  - set AZ_EXT_REF_DOC_OUT_DIR=xmls
+  - python ./scripts/ci/index_ref_doc.py -v
+  - deactivate
   - mkdir %TEMP%\azure-cli-xml2yml
   - cd %TEMP%\azure-cli-xml2yml
   - nuget install azure.cli.doc.xml2yml -Source https://ci.appveyor.com/nuget/azure-docs-cli-pre-process
   - cd azure.cli.doc.xml2yml*\tools
-  - AzCliDocPreprocessor -s "%APPVEYOR_BUILD_FOLDER%\doc\sphinx\_build\xml" -d "%TEMP%\azure-cli-xml2yml\yml-output" -r "https://github.com/%APPVEYOR_REPO_NAME%" -b "%APPVEYOR_REPO_BRANCH%" -c "%APPVEYOR_BUILD_FOLDER%\doc\sphinx\doc_commit_map.json" -v 1
+  - AzCliDocPreprocessor -s "%APPVEYOR_BUILD_FOLDER%\doc\sphinx\_build\xml" -x "%TEMP%\azure-cli-extensions\xmls" -d "%TEMP%\azure-cli-xml2yml\yml-output" -r "https://github.com/%APPVEYOR_REPO_NAME%" -b "%APPVEYOR_REPO_BRANCH%" -c "%APPVEYOR_BUILD_FOLDER%\doc\sphinx\doc_commit_map.json" -v 1
 
 artifacts:
   - path: doc\sphinx\_build
diff --git a/appveyor.yml b/appveyor.yml
index e7c9a4f1ad6..3c76130ad00 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,6 +9,9 @@ environment:
   PYTHON: "C:\\Python35"
   access_token:
     secure: VMFbecLLHzDq/09YDPbcM0VDDSwwgY57vr5GXK6cZZ4Ti/Xs5RZoylzV8MMr1350
+  extension_repo: "https://github.com/Azure/azure-cli-extensions"
+  extension_branch: "master"
+  extentsion_folder: "_ext"
 
 install:
   - SET PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%
@@ -42,11 +45,20 @@ build_script:
       $fileCommitMap | ConvertTo-Json | Out-File "$env:APPVEYOR_BUILD_FOLDER\doc\sphinx\doc_commit_map.json"
   - cd doc\sphinx 
   - make xmlwithversion
+  - git clone --depth 5 -q --branch=%extension_branch% %extension_repo% %TEMP%\azure-cli-extensions
+  - cd %TEMP%\azure-cli-extensions
+  - virtualenv --no-site-packages venv
+  - .\venv\Scripts\activate
+  - pip install azure-cli sphinx==1.7.0
+  - mkdir xmls
+  - set AZ_EXT_REF_DOC_OUT_DIR=xmls
+  - python ./scripts/ci/index_ref_doc.py -v
+  - deactivate
   - mkdir %TEMP%\azure-cli-xml2yml
   - cd %TEMP%\azure-cli-xml2yml
   - nuget install azure.cli.doc.xml2yml -Source https://ci.appveyor.com/nuget/azure-docs-cli-pre-process
   - cd azure.cli.doc.xml2yml*\tools
-  - AzCliDocPreprocessor -s "%APPVEYOR_BUILD_FOLDER%\doc\sphinx\_build\xml" -d "%TEMP%\azure-cli-xml2yml\yml-output" -r "https://github.com/%APPVEYOR_REPO_NAME%" -b "%APPVEYOR_REPO_BRANCH%" -c "%APPVEYOR_BUILD_FOLDER%\doc\sphinx\doc_commit_map.json" -v 1
+  - AzCliDocPreprocessor -s "%APPVEYOR_BUILD_FOLDER%\doc\sphinx\_build\xml" -x "%TEMP%\azure-cli-extensions\xmls" -d "%TEMP%\azure-cli-xml2yml\yml-output" -r "https://github.com/%APPVEYOR_REPO_NAME%" -b "%APPVEYOR_REPO_BRANCH%" -c "%APPVEYOR_BUILD_FOLDER%\doc\sphinx\doc_commit_map.json" -v 1
 
 artifacts:
   - path: doc\sphinx\_build