diff --git a/VERSION b/VERSION
index 46a593aa6..a98ccbcba 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.0~a24-1
+4.0~alpha25-1
diff --git a/debian/changelog b/debian/changelog
index 64d8c1d37..d825f0850 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+live-build (4.0~alpha25-1) experimental; urgency=low
+
+  [ Richard Nelson ]
+  * Modify l-b-cgi frontend logging paths.
+
+  [ Daniel Baumann ]
+  * Making workaround for apt-get source actually working in backports-
+    included-but-not-enabled scenarios.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch>  Wed, 18 Sep 2013 10:23:16 +0200
+
 live-build (4.0~a24-1) experimental; urgency=low
 
   * Updating initsystem default for progress-linux releases.
diff --git a/manpages/de/lb_bootstrap_cdebootstrap.de.1 b/manpages/de/lb_bootstrap_cdebootstrap.de.1
index 5600276ae..10ae55543 100644
--- a/manpages/de/lb_bootstrap_cdebootstrap.de.1
+++ b/manpages/de/lb_bootstrap_cdebootstrap.de.1
@@ -11,7 +11,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 06.09.2013 4.0~a24\-1 "Live Systems Projekt"
+.TH LIVE\-BUILD 1 18.09.2013 4.0~alpha25\-1 "Live Systems Projekt"
 
 .SH NAME
 \fBlive\-build\fP \- System Build Skripte
diff --git a/manpages/de/lb_bootstrap_debootstrap.de.1 b/manpages/de/lb_bootstrap_debootstrap.de.1
index b58c11b5b..15fb4c148 100644
--- a/manpages/de/lb_bootstrap_debootstrap.de.1
+++ b/manpages/de/lb_bootstrap_debootstrap.de.1
@@ -11,7 +11,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 06.09.2013 4.0~a24\-1 "Live Systems Projekt"
+.TH LIVE\-BUILD 1 18.09.2013 4.0~alpha25\-1 "Live Systems Projekt"
 
 .SH NAME
 \fBlive\-build\fP \- System Build Skripte
diff --git a/manpages/en/lb_bootstrap_cdebootstrap.1 b/manpages/en/lb_bootstrap_cdebootstrap.1
index f41783043..33ce2292f 100644
--- a/manpages/en/lb_bootstrap_cdebootstrap.1
+++ b/manpages/en/lb_bootstrap_cdebootstrap.1
@@ -6,7 +6,7 @@
 .\" under certain conditions; see COPYING for details.
 .\"
 .\"
-.TH LIVE\-BUILD 1 2013\-09\-06 4.0~a24-1 "Live Systems Project"
+.TH LIVE\-BUILD 1 2013\-09\-18 4.0~alpha25-1 "Live Systems Project"
 
 .SH NAME
 \fBlive\-build\fR \- System Build Scripts
diff --git a/manpages/en/lb_bootstrap_debootstrap.1 b/manpages/en/lb_bootstrap_debootstrap.1
index fc2ec0c38..7f6fe9791 100644
--- a/manpages/en/lb_bootstrap_debootstrap.1
+++ b/manpages/en/lb_bootstrap_debootstrap.1
@@ -6,7 +6,7 @@
 .\" under certain conditions; see COPYING for details.
 .\"
 .\"
-.TH LIVE\-BUILD 1 2013\-09\-06 4.0~a24-1 "Live Systems Project"
+.TH LIVE\-BUILD 1 2013\-09\-18 4.0~alpha25-1 "Live Systems Project"
 
 .SH NAME
 \fBlive\-build\fR \- System Build Scripts
diff --git a/manpages/es/lb_bootstrap_cdebootstrap.es.1 b/manpages/es/lb_bootstrap_cdebootstrap.es.1
index 25bdf8fab..212a35c73 100644
--- a/manpages/es/lb_bootstrap_cdebootstrap.es.1
+++ b/manpages/es/lb_bootstrap_cdebootstrap.es.1
@@ -11,7 +11,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 06.09.2013 4.0~a24\-1 "Proyecto Live Systems"
+.TH LIVE\-BUILD 1 18.09.2013 4.0~alpha25\-1 "Proyecto Live Systems"
 
 .SH NOMBRE
 \fBlive\-build\fP \- Scripts de Creación del Sistema
diff --git a/manpages/es/lb_bootstrap_debootstrap.es.1 b/manpages/es/lb_bootstrap_debootstrap.es.1
index fee8b7b89..82727b458 100644
--- a/manpages/es/lb_bootstrap_debootstrap.es.1
+++ b/manpages/es/lb_bootstrap_debootstrap.es.1
@@ -11,7 +11,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 06.09.2013 4.0~a24\-1 "Proyecto Live Systems"
+.TH LIVE\-BUILD 1 18.09.2013 4.0~alpha25\-1 "Proyecto Live Systems"
 
 .SH NOMBRE
 \fBlive\-build\fP \- Scripts de Creación del Sistema
diff --git a/manpages/po/de/lb_bootstrap_cdebootstrap.1.po b/manpages/po/de/lb_bootstrap_cdebootstrap.1.po
index 6adc8d6c5..5b87a32ee 100644
--- a/manpages/po/de/lb_bootstrap_cdebootstrap.1.po
+++ b/manpages/po/de/lb_bootstrap_cdebootstrap.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-build 4.0~a24-1\n"
-"POT-Creation-Date: 2013-09-06 20:05+0300\n"
+"Project-Id-Version: live-build 4.0~alpha25-1\n"
+"POT-Creation-Date: 2013-09-18 10:24+0300\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
 "Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n"
 "Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-BUILD"
 #. type: TH
 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
 #, no-wrap
-msgid "2013-09-06"
-msgstr "06.09.2013"
+msgid "2013-09-18"
+msgstr "18.09.2013"
 
 #. type: TH
 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
 #, no-wrap
-msgid "4.0~a24-1"
-msgstr "4.0~a24-1"
+msgid "4.0~alpha25-1"
+msgstr "4.0~alpha25-1"
 
 #. type: TH
 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
diff --git a/manpages/po/de/lb_bootstrap_debootstrap.1.po b/manpages/po/de/lb_bootstrap_debootstrap.1.po
index 99d872858..5e8eb944c 100644
--- a/manpages/po/de/lb_bootstrap_debootstrap.1.po
+++ b/manpages/po/de/lb_bootstrap_debootstrap.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-build 4.0~a24-1\n"
-"POT-Creation-Date: 2013-09-06 20:05+0300\n"
+"Project-Id-Version: live-build 4.0~alpha25-1\n"
+"POT-Creation-Date: 2013-09-18 10:24+0300\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
 "Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n"
 "Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-BUILD"
 #. type: TH
 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
 #, no-wrap
-msgid "2013-09-06"
-msgstr "06.09.2013"
+msgid "2013-09-18"
+msgstr "18.09.2013"
 
 #. type: TH
 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
 #, no-wrap
-msgid "4.0~a24-1"
-msgstr "4.0~a24-1"
+msgid "4.0~alpha25-1"
+msgstr "4.0~alpha25-1"
 
 #. type: TH
 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
diff --git a/manpages/po/es/lb_bootstrap_cdebootstrap.1.po b/manpages/po/es/lb_bootstrap_cdebootstrap.1.po
index e0c5b2810..b0d8106f1 100644
--- a/manpages/po/es/lb_bootstrap_cdebootstrap.1.po
+++ b/manpages/po/es/lb_bootstrap_cdebootstrap.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-build 4.0~a24-1\n"
-"POT-Creation-Date: 2013-09-06 20:05+0300\n"
+"Project-Id-Version: live-build 4.0~alpha25-1\n"
+"POT-Creation-Date: 2013-09-18 10:24+0300\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
 "Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
 "Language-Team: none\n"
@@ -23,14 +23,14 @@ msgstr "LIVE-BUILD"
 #. type: TH
 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
 #, no-wrap
-msgid "2013-09-06"
-msgstr "06.09.2013"
+msgid "2013-09-18"
+msgstr "18.09.2013"
 
 #. type: TH
 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
 #, no-wrap
-msgid "4.0~a24-1"
-msgstr "4.0~a24-1"
+msgid "4.0~alpha25-1"
+msgstr "4.0~alpha25-1"
 
 #. type: TH
 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
diff --git a/manpages/po/es/lb_bootstrap_debootstrap.1.po b/manpages/po/es/lb_bootstrap_debootstrap.1.po
index d0f23ee5a..d09b5e7db 100644
--- a/manpages/po/es/lb_bootstrap_debootstrap.1.po
+++ b/manpages/po/es/lb_bootstrap_debootstrap.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-build 4.0~a24-1\n"
-"POT-Creation-Date: 2013-09-06 20:05+0300\n"
+"Project-Id-Version: live-build 4.0~alpha25-1\n"
+"POT-Creation-Date: 2013-09-18 10:24+0300\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
 "Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
 "Language-Team: none\n"
@@ -23,14 +23,14 @@ msgstr "LIVE-BUILD"
 #. type: TH
 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
 #, no-wrap
-msgid "2013-09-06"
-msgstr "06.09.2013"
+msgid "2013-09-18"
+msgstr "18.09.2013"
 
 #. type: TH
 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
 #, no-wrap
-msgid "4.0~a24-1"
-msgstr "4.0~a24-1"
+msgid "4.0~alpha25-1"
+msgstr "4.0~alpha25-1"
 
 #. type: TH
 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
diff --git a/manpages/pot/lb_bootstrap_cdebootstrap.1.pot b/manpages/pot/lb_bootstrap_cdebootstrap.1.pot
index b7bb9600b..95e26fe11 100644
--- a/manpages/pot/lb_bootstrap_cdebootstrap.1.pot
+++ b/manpages/pot/lb_bootstrap_cdebootstrap.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2013-09-06 20:05+0300\n"
+"POT-Creation-Date: 2013-09-18 10:24+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,13 +25,13 @@ msgstr ""
 #. type: TH
 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
 #, no-wrap
-msgid "2013-09-06"
+msgid "2013-09-18"
 msgstr ""
 
 #. type: TH
 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
 #, no-wrap
-msgid "4.0~a24-1"
+msgid "4.0~alpha25-1"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lb_bootstrap_debootstrap.1.pot b/manpages/pot/lb_bootstrap_debootstrap.1.pot
index 4ab04a031..6c85c30f4 100644
--- a/manpages/pot/lb_bootstrap_debootstrap.1.pot
+++ b/manpages/pot/lb_bootstrap_debootstrap.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2013-09-06 20:05+0300\n"
+"POT-Creation-Date: 2013-09-18 10:24+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,13 +25,13 @@ msgstr ""
 #. type: TH
 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
 #, no-wrap
-msgid "2013-09-06"
+msgid "2013-09-18"
 msgstr ""
 
 #. type: TH
 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
 #, no-wrap
-msgid "4.0~a24-1"
+msgid "4.0~alpha25-1"
 msgstr ""
 
 #. type: TH