diff --git a/vim-youcompleteme-git/.SRCINFO b/vim-youcompleteme-git/.SRCINFO
index 2ef649b..97f36e4 100644
--- a/vim-youcompleteme-git/.SRCINFO
+++ b/vim-youcompleteme-git/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = vim-youcompleteme-git
 	pkgdesc = A code-completion engine for Vim
-	pkgver = r2471.48c3bcc4
+	pkgver = r2478.c25e449f
 	pkgrel = 1
 	url = https://github.com/Valloric/YouCompleteMe
 	install = install
diff --git a/vim-youcompleteme-git/PKGBUILD b/vim-youcompleteme-git/PKGBUILD
index e506271..fdbc480 100644
--- a/vim-youcompleteme-git/PKGBUILD
+++ b/vim-youcompleteme-git/PKGBUILD
@@ -24,6 +24,8 @@ _gocode="y"
 _rust="y"
 _tern="y"
 _java="n"
+_docs="n"
+_tests="n"
 _use_system_clang="ON"
 _use_python2="OFF"
 
@@ -37,7 +39,7 @@ _neovim="$NEOVIM_YOUCOMPLETEME"
 #                                    Default PKGBUILD Configuration                                       #
 #=========================================================================================================#
 pkgname=vim-youcompleteme-git
-pkgver=r2471.48c3bcc4
+pkgver=r2478.c25e449f
 pkgver() {
 	cd "YouCompleteMe" || exit
 	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
@@ -174,11 +176,11 @@ prepare() {
 	msg2 'Setting up Git submodules...'
 
 	local YouCompleteMe=("requests-futures" "ycmd" "python-future")
-	local YouCompleteMeRequestsDeps=("idna" "certifi" "chardet" "urllib3" "requests")
+	local YouCompleteMeRequestsDeps=("idna" "python-certifi" "chardet" "urllib3" "requests")
 	gitprepare "YouCompleteMe" "third_party/" "${YouCompleteMe[@]}"
 	gitprepare "YouCompleteMe" "third_party/requests_deps/" "${YouCompleteMeRequestsDeps[@]}"
 
-	local ycmd=("bottle" "regex" "python-frozendict" "jedi" "parso" "python-future" "waitress" "requests")
+	local ycmd=("bottle" "regex" "python-frozendict" "python-future" "waitress")
 
 	if [[ "$_omnisharp" == "y" ]]; then
 		ycmd+=("OmniSharpServer")
@@ -190,6 +192,12 @@ prepare() {
 
 	gitprepare "YouCompleteMe/third_party/ycmd" "third_party/" "${ycmd[@]}"
 
+	local ycmdJediDeps=("jedi" "parso")
+	gitprepare "YouCompleteMe/third_party/ycmd" "third_party/jedi_deps" "${ycmdJediDeps[@]}"
+
+	local ycmdRequestsDeps=("python-certifi" "chardet" "idna" "requests" "urllib3")
+	gitprepare "YouCompleteMe/third_party/ycmd" "third_party/requests_deps" "${ycmdRequestsDeps[@]}"
+
 	if [[ "$_gocode" == "y" ]]; then
                 gitprepare "YouCompleteMe/third_party/ycmd/third_party/go/src/github.com/mdempsky" "" "gocode"
                 gitprepare "YouCompleteMe/third_party/ycmd/third_party/go/src/github.com/rogpeppe" "" "godef"
@@ -267,7 +275,10 @@ package() {
 		vimfiles_dir=usr/share/nvim/runtime
 	fi
 
-	mkdir -p "$pkgdir/$vimfiles_dir/third_party/ycmd/third_party"
+	# mkdir -p "$pkgdir/$vimfiles_dir/third_party/ycmd/third_party"
+	mkdir -p "$pkgdir/$vimfiles_dir/third_party/ycmd/third_party/requests_deps"
+	mkdir -p "$pkgdir/$vimfiles_dir/third_party/ycmd/third_party/jedi_deps"
+        
 	mkdir -p "$pkgdir/$vimfiles_dir/third_party/requests_deps"
 
 	cp -r "$srcdir/YouCompleteMe/"{autoload,doc,plugin,python} \
@@ -276,10 +287,15 @@ package() {
 		"$pkgdir/$vimfiles_dir/third_party"
 	cp -r "$srcdir/YouCompleteMe/third_party/requests_deps/"{certifi,chardet,idna,requests,urllib3} \
 		"$pkgdir/$vimfiles_dir/third_party/requests_deps"
-	cp -r "$srcdir/YouCompleteMe/third_party/ycmd/"{ycmd,ycm_core.so,CORE_VERSION,clang_includes} \
+
+	cp -r "$srcdir/YouCompleteMe/third_party/ycmd/"{ycmd,ycm_core.so,CORE_VERSION} \
 		"$pkgdir/$vimfiles_dir/third_party/ycmd"
-	cp -r "$srcdir/YouCompleteMe/third_party/ycmd/third_party/"{bottle,cregex,frozendict,jedi,parso,python-future,requests,waitress} \
+	cp -r "$srcdir/YouCompleteMe/third_party/ycmd/third_party/"{bottle,clang,cregex,frozendict,python-future,waitress} \
 		"$pkgdir/$vimfiles_dir/third_party/ycmd/third_party"
+	cp -r "$srcdir/YouCompleteMe/third_party/ycmd/third_party/requests_deps/"{certifi,chardet,idna,requests,urllib3} \
+		"$pkgdir/$vimfiles_dir/third_party/ycmd/third_party/requests_deps"
+	cp -r "$srcdir/YouCompleteMe/third_party/ycmd/third_party/jedi_deps/"{jedi,parso} \
+		"$pkgdir/$vimfiles_dir/third_party/ycmd/third_party/jedi_deps"
 
 	if [[ "$_omnisharp" == "y" ]]; then
 		mkdir -p "$pkgdir/$vimfiles_dir/third_party/ycmd/third_party/OmniSharpServer/OmniSharp/bin/Release"
@@ -314,15 +330,13 @@ package() {
 	fi
 
 	# Remove all the unnecessary git repositories
-	find "$pkgdir" -name .git -exec rm -fr {} +
+        find "$pkgdir" -name '.git*' -exec rm -fr {} +
 
 	# Remove test files
-	rm -r "$pkgdir/$vimfiles_dir/third_party/ycmd/ycmd/tests"
-	rm -r "$pkgdir/$vimfiles_dir/third_party/ycmd/third_party/parso/test"
-	rm -r "$pkgdir/$vimfiles_dir/third_party/ycmd/third_party/python-future/tests"
-	rm -r "$pkgdir/$vimfiles_dir/third_party/ycmd/third_party/jedi/test"
-	rm -r "$pkgdir/$vimfiles_dir/third_party/ycmd/third_party/waitress/waitress/tests"
-	rm -r "$pkgdir/$vimfiles_dir/third_party/ycmd/third_party/bottle/test"
+	if [[ "$_tests" == "n" ]]; then
+                find "$pkgdir" -name tests -exec rm -fr {} +
+                find "$pkgdir" -name 'test' -exec rm -fr {} +
+        fi
 
 	# Remove any file we cannot compile using a specfic python version
 	if [[ "$_use_python2" == "ON" ]]; then
@@ -333,7 +347,10 @@ package() {
 	fi
 
 	# Remove unneeded docs
-	rm -r "$pkgdir/$vimfiles_dir/third_party/ycmd/third_party/python-future/docs"
+	if [[ "$_docs" == "n" ]]; then
+                find "$pkgdir" -name docs -exec rm -fr {} +
+                find "$pkgdir/$vimfiles_dir/third_party/" -name doc -exec rm -fr {} +
+        fi
 
 	# Finally compile all the python files to bytecode.
         # not sure why this block causes the pkg function to fail unless you add "|| :"