diff --git a/cookbooks/reverse_proxy/recipes/documentation.rb b/cookbooks/reverse_proxy/recipes/documentation.rb
index c38bbb8..98a6505 100644
--- a/cookbooks/reverse_proxy/recipes/documentation.rb
+++ b/cookbooks/reverse_proxy/recipes/documentation.rb
@@ -1,4 +1,4 @@
-docs = File.expand_path('../../../docs/_build/html', File.dirname(__FILE__))
+docs = File.expand_path("../../../docs/_build/#{node['environment']}/html", File.dirname(__FILE__))
 
 execute 'rsync::docs' do
   command "rsync -avp --delete #{docs}/ /srv/doc/"
diff --git a/docs/Makefile b/docs/Makefile
index 208d317..4072305 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -25,7 +25,7 @@ _build/%: %.in build.rb
 CLEAN_FILES += $(BUILT)
 
 html latexpdf: $(BUILT)
-	$(MAKE) -C _build $@
+	$(MAKE) -C _build $@ BUILDDIR=$(SPB_ENV)
 
 clean:
 	$(RM) $(BUILT)
--
libgit2 0.21.2