diff --git a/Makefile b/Makefile
index bec180e..1713a38 100644
--- a/Makefile
+++ b/Makefile
@@ -15,50 +15,52 @@ _SOURCES=$(_SRCBASE)/source
 
 ## ############################################################################
 
-PACKAGE_APACHE2=$(_DOWNLOADS)/httpd-2.0.59.tar.bz2
-DOWNLOAD_APACHE2=http://apache.speedbone.de/httpd/httpd-2.0.59.tar.bz2
+PACKAGE_APACHE2=httpd-2.0.59.tar.bz2
+DOWNLOAD_APACHE2=http://apache.speedbone.de/httpd/$(PACKAGE_APACHE2)
 SOURCE_APACHE2=$(_SOURCES)/httpd-2.0.59
 
-PACKAGE_RPAF=$(_DOWNLOADS)/mod_rpaf-0.5.tar.gz
-DOWNLOAD_RPAF=http://stderr.net/apache/rpaf/download/mod_rpaf-0.5.tar.gz
+PACKAGE_RPAF=mod_rpaf-0.5.tar.gz
+DOWNLOAD_RPAF=http://stderr.net/apache/rpaf/download/$(PACKAGE_RPAF)
 SOURCE_RPAF=$(_SOURCES)/mod_rpaf-0.5
 
-PACKAGE_PHP4=$(_DOWNLOADS)/php-4.4.4.tar.bz2
-DOWNLOAD_PHP4=http://de3.php.net/get/php-4.4.4.tar.bz2/from/de.php.net/mirror
+PACKAGE_PHP4=php-4.4.4.tar.bz2
+DOWNLOAD_PHP4=http://de3.php.net/get/$(PACKAGE_PHP4)/from/de.php.net/mirror
 SOURCE_PHP4=$(_SOURCES)/php-4.4.4
 
-PACKAGE_EACCELERATOR=$(_DOWNLOADS)/eaccelerator-0.9.5.tar.bz2
-DOWNLOAD_EACCELERATOR=http://surfnet.dl.sourceforge.net/sourceforge/eaccelerator/eaccelerator-0.9.5.tar.bz2
+PACKAGE_EACCELERATOR=eaccelerator-0.9.5.tar.bz2
+DOWNLOAD_EACCELERATOR=http://surfnet.dl.sourceforge.net/sourceforge/eaccelerator/$(PACKAGE_EACCELERATOR)
 SOURCE_EACCELERATOR=$(_SOURCES)/eaccelerator-0.9.5
 
 ## ############################################################################
 
-$(PACKAGE_APACHE2):
+all: apache2-fe apache2-be
+
+$(_DOWNLOADS)/$(PACKAGE_APACHE2):
 	$(WGET) -P $(_DOWNLOADS) $(DOWNLOAD_APACHE2)
 
-$(SOURCE_APACHE2)/.unpacked: $(PACKAGE_APACHE2)
-	tar -C $(_SOURCES) -xjf $(PACKAGE_APACHE2)
+$(SOURCE_APACHE2)/.unpacked: $(_DOWNLOADS)/$(PACKAGE_APACHE2)
+	tar -C $(_SOURCES) -xjf $(_DOWNLOADS)/$(PACKAGE_APACHE2)
 	touch $@
 
-$(PACKAGE_RPAF):
+$(_DOWNLOADS)/$(PACKAGE_RPAF):
 	$(WGET) -P $(_DOWNLOADS) $(DOWNLOAD_RPAF) 
 
-$(SOURCE_RPAF)/.unpacked: $(PACKAGE_RPAF)
-	tar -C $(_SOURCES) -xzf $(PACKAGE_RPAF)
+$(SOURCE_RPAF)/.unpacked: $(_DOWNLOADS)/$(PACKAGE_RPAF)
+	tar -C $(_SOURCES) -xzf $(_DOWNLOADS)/$(PACKAGE_RPAF)
 	touch $@
 
-$(PACKAGE_PHP4):
+$(_DOWNLOADS)/$(PACKAGE_PHP4):
 	$(WGET) -P $(_DOWNLOADS) $(DOWNLOAD_PHP4)
 
-$(SOURCE_PHP4)/.unpacked: $(PACKAGE_PHP4)
-	tar -C $(_SOURCES) -xjf $(PACKAGE_PHP4)
+$(SOURCE_PHP4)/.unpacked: $(_DOWNLOADS)/$(PACKAGE_PHP4)
+	tar -C $(_SOURCES) -xjf $(_DOWNLOADS)/$(PACKAGE_PHP4)
 	touch $@
 
-$(PACKAGE_EACCELERATOR):
+$(_DOWNLOADS)/$(PACKAGE_EACCELERATOR):
 	$(WGET) -P $(_DOWNLOADS) $(DOWNLOAD_EACCELERATOR)
 
-$(SOURCE_EACCELERATOR)/.unpacked: $(PACKAGE_EACCELERATOR)
-	tar -C $(_SOURCES) -xjf $(PACKAGE_EACCELERATOR)
+$(SOURCE_EACCELERATOR)/.unpacked: $(_DOWNLOADS)/$(PACKAGE_EACCELERATOR)
+	tar -C $(_SOURCES) -xjf $(_DOWNLOADS)/$(PACKAGE_EACCELERATOR)
 	touch $@
 
 ## ############################################################################
@@ -175,7 +177,6 @@ $(SOURCE_EACCELERATOR)/.installed:  $(SOURCE_EACCELERATOR)/.compiled
 	make -C $(SOURCE_EACCELERATOR) install
 	touch $@
 
-
 apache2-be-clean:
 	rm -rf $(_BUILD_APACHE2_BACKEND)
 	rm -rf $(SOURCE_RPAF)