diff --git a/.gitignore b/.gitignore
index a2ab24044a..696d2447c3 100755
--- a/.gitignore
+++ b/.gitignore
@@ -47,7 +47,7 @@ indra/newview/dbghelp.dll
 indra/newview/filters.xml
 indra/newview/fmod.dll
 indra/newview/fmod.log
-indra/newview/fonts
+#indra/newview/fonts # <FS:Ansariel> Don't copy fonts to the source folder
 indra/newview/mozilla-theme
 indra/newview/mozilla-universal-darwin.tgz
 indra/newview/pilot.txt
diff --git a/indra/llrender/llfontregistry.cpp b/indra/llrender/llfontregistry.cpp
index a7ec576542..747f63d21c 100644
--- a/indra/llrender/llfontregistry.cpp
+++ b/indra/llrender/llfontregistry.cpp
@@ -519,6 +519,8 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc)
 	font_search_paths.push_back(LLFontGL::getFontPathSystem());
 	// <FS:Kadah> User fonts: Also load from user_settings/fonts
 	font_search_paths.push_back(gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS , "fonts", ""));
+	// <FS:Ansariel> Search executable path as well - in case we run from within VS (seems to work without as well, but just to be safe)
+	font_search_paths.push_back(gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, "fonts", ""));
 #if LL_DARWIN
 	font_search_paths.push_back(MACOSX_FONT_PATH_LIBRARY);
 	font_search_paths.push_back(MACOSX_FONT_PATH_LIBRARY + MACOSX_FONT_SUPPLEMENTAL);
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 4004d71ad8..8fa5a22f62 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1899,11 +1899,13 @@ if (WINDOWS)
         set(viewer_SOURCE_FILES "${viewer_SOURCE_FILES}" llviewerprecompiledheaders.cpp)
     endif(USE_PRECOMPILED_HEADERS)
 
-    message("Copying fonts")
-    file(GLOB FONT_FILE_GLOB_LIST
-      "${AUTOBUILD_INSTALL_DIR}/fonts/*"
-    )
-    file(COPY ${FONT_FILE_GLOB_LIST} DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/fonts")
+    # <FS:Ansariel> Don't copy fonts into the source folder!
+    # message("Copying fonts")
+    # file(GLOB FONT_FILE_GLOB_LIST
+      # "${AUTOBUILD_INSTALL_DIR}/fonts/*"
+    # )
+    # file(COPY ${FONT_FILE_GLOB_LIST} DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/fonts")
+    # </FS:Ansariel>
 
     # Replace the icons with the appropriate ones for the channel
     # ('test' is the default)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index c8fa924b58..1daacf1ee0 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -85,7 +85,12 @@ class ViewerManifest(LLManifest,FSViewerManifest):
         # <FS:Ansariel> Copy 360 snapshot JavaScripts
         with self.prefix(src=pkgdir, dst="skins/default/html/common/equirectangular"):
             self.path("js")
-        # </FS:LO>
+        # </FS:Ansariel>
+
+        # <FS:Ansariel> Copy 3p fonts to build output
+        with self.prefix(src=pkgdir):
+            self.path("fonts")
+        # </FS:Ansariel>
 
         if self.is_packaging_viewer():
             with self.prefix(src_dst="app_settings"):
@@ -176,7 +181,10 @@ class ViewerManifest(LLManifest,FSViewerManifest):
                 self.path("*.tga")
 
             # Include our fonts
-            with self.prefix(src="../packages/fonts",src_dst="fonts"):
+            # <FS:Ansariel> Don't copy fonts to the source folder
+            #with self.prefix(src="../packages/fonts",src_dst="fonts"):
+            with self.prefix(src_dst="fonts"):
+            # </FS:Ansariel>
                 self.path("*.ttf")
                 self.path("*.txt")
                 self.path("*.xml")