diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index b2d52808a..e268a4b28 100644
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -408,6 +408,19 @@ Section "Viewer"
   
   ;This placeholder is replaced by the complete list of all the files in the installer, by viewer_manifest.py
   %%INSTALL_FILES%%
+
+  ;Download LibVLC
+!ifdef WIN64_BIN_BUILD
+  NSISdl::download "http://download.videolan.org/pub/videolan/vlc/2.2.8/win64/vlc-2.2.8-win64.7z" "$INSTDIR\libvlc.7z"
+!else
+  NSISdl::download "http://download.videolan.org/pub/videolan/vlc/2.2.8/win32/vlc-2.2.8-win32.7z" "$INSTDIR\libvlc.7z"
+!endif
+  Nsis7z::Extract "$INSTDIR\libvlc.7z"
+  Rename "$INSTDIR\vlc-2.2.8\libvlc.dll" "$INSTDIR\llplugin\libvlc.dll"
+  Rename "$INSTDIR\vlc-2.2.8\libvlccore.dll" "$INSTDIR\llplugin\libvlccore.dll"
+  Rename "$INSTDIR\vlc-2.2.8\plugins" "$INSTDIR\llplugin\plugins"
+  RMDir /r "$INSTDIR\vlc-2.2.8"
+  Delete "$INSTDIR\libvlc.7z"
   
   ;Pass the installer's language to the client to use as a default
   StrCpy $SHORTCUT_LANG_PARAM "--set InstallLanguage $(LanguageCode)"
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 30eef53ea..94f51e662 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -660,6 +660,8 @@ class WindowsManifest(ViewerManifest):
         out_path = None
         for pkg_file in dest_files:
             rel_file = os.path.normpath(pkg_file.replace(self.get_dst_prefix()+os.path.sep,''))
+            if install and rel_file.startswith(("llplugin\\libvlc", "llplugin\\plugins\\")):
+                continue
             installed_dir = wpath(os.path.join('$INSTDIR', os.path.dirname(rel_file)))
             pkg_file = wpath(os.path.normpath(pkg_file))
             if installed_dir != out_path: