diff --git a/.gitignore b/.gitignore
index ff9fd9eac..44a480811 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+kivy-already-built
 .coverage
 .noseids
 Kivy.egg-info
diff --git a/Makefile b/Makefile
index 57580c8ab..3aa11545d 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,15 @@ IOSPATH := $(PATH):/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin
 
 .PHONY: build force mesabuild pdf style stylereport hook test batchtest cover clean distclean theming
 
+prebuild:
+ifeq ("$(wildcard kivy-already-built)","")
+	@echo Building Kivy as it is not already done!
+	$(PYTHON) setup.py build_ext --inplace
+	touch kivy-already-built
+else
+	@echo Kivy is already built!
+endif
+
 build:
 	$(PYTHON) setup.py build_ext --inplace
 
@@ -40,10 +49,13 @@ ios:
 	# Copy to python for iOS installation
 	cp -R "iosbuild/usr/local/lib/python2.7/site-packages/kivy" "$(BUILDROOT)/python/lib/python2.7/site-packages"
 
-pdf:
+pdf: prebuild
 	$(MAKE) -C doc pdf
 
-html:
+html: prebuild
+	$(MAKE) -C doc html
+
+html-embedded:
 	env USE_EMBEDSIGNATURE=1 $(MAKE) force
 	$(MAKE) -C doc html
 
@@ -69,6 +81,7 @@ cover:
 install:
 	python setup.py install
 clean:
+	-rm -f kivy-already-built
 	-rm -rf doc/build
 	-rm -rf build
 	-rm -rf htmlcov