diff --git a/Makefile b/Makefile
index 5545f51f0a01e8a82ccc2092861215df74882c2c..380017eea73b090a023173cd523624cbb2d91a3d 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,9 @@ GLUONDIR:=${CURDIR}
 
 LN_S:=ln -sf
 
-all: images
+all:
+	$(MAKE) prepare
+	$(MAKE) images
 
 include $(GLUONDIR)/builder/gluon.mk
 
diff --git a/README.md b/README.md
index 36e1b687cc63482a13fecbe30103b05d343c6c87..09d17729cbadffd4d54746d230cbf33c2bc91581 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,9 @@ To build Gluon, use the following commands after checking out the repository:
     git clone git://github.com/freifunk-gluon/site-ffhl.git site # Get the Freifunk Lübeck site repository - or use your own!
     make                                                         # Build Gluon
 
-When building Gluon for the first time, the OpenWRT build environment is prepared. To update the OpenWRT
-environment, e. g. to compile added or changed packages, just use:
+When calling make, the OpenWRT build environment is prepared/updated. To rebuilt
+the images only, just use:
 
-    make prepare
+    make images
 
 The built images can be found in the directory /images.