diff --git a/.travis.sh b/.travis.sh
new file mode 100644
index 00000000..90a439b3
--- /dev/null
+++ b/.travis.sh
@@ -0,0 +1,45 @@
+# Add current directory to PATH
+export PATH="$(pwd):$PATH"
+
+# Manage the travis build
+ct-ng_travis_build()
+{
+	# Override the log behaviour
+	sed -i	-e 's/^.*\(CT_LOG_ERROR\).*$/# \1 is not set/' \
+		-e 's/^.*\(CT_LOG_WARN\).*$/# \1 is not set/' \
+		-e 's/^.*\(CT_LOG_INFO\).*$/# \1 is not set/' \
+		-e 's/^.*\(CT_LOG_EXTRA\).*$/\1=y/' \
+		-e 's/^.*\(CT_LOG_ALL\).*$/# \1 is not set/' \
+		-e 's/^.*\(CT_LOG_DEBUG\).*$/# \1 is not set/' \
+		-e 's/^.*\(CT_LOG_LEVEL_MAX\).*$/\1="EXTRA"/' \
+		-e 's/^.*\(CT_LOG_PROGRESS_BAR\).*$/# \1 is not set/' \
+		-e 's/^.*\(CT_LOCAL_TARBALLS_DIR\).*$/\1="${HOME}\/src"/' \
+		-e 's/^.*\(CT_SAVE_TARBALLS\).*$/\1=y/' \
+		.config
+
+	# Build the sample
+	ct-ng build.2 &
+	local build_pid=$!
+
+	# Start a runner task to print a "still running" line every 5 minutes
+	# to avoid travis to think that the build is stuck
+	{
+		while true
+		do
+			sleep 300
+			printf "Crosstool-NG is still running ...\r"
+		done
+	} &
+	local runner_pid=$!
+
+	# Wait for the build to finish and get the result
+	wait $build_pid 2>/dev/null
+	local result=$?
+
+	# Stop the runner task
+	kill $runner_pid
+	wait $runner_pid 2>/dev/null
+
+	# Return the result
+	return $result
+}
diff --git a/.travis.yml b/.travis.yml
index 93765c71..e1750248 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,10 +42,10 @@ env:
 
 # Building the standard samples
 script:
-    - ./ct-ng $CT_SAMPLE
-    - CT_LOG_DEBUG=y CT_LOG_LEVEL_MAX="DEBUG" ./ct-ng build.2
+    - . ./.travis.sh      # Load the travis environment
+    - ct-ng $CT_SAMPLE    # Configure the build
+    - ct-ng_travis_build  # Build the sample
 
 # On failure displaying the last lines of the log file
 after_failure:
-    - tail -n 200 build.log
-
+    - tail -n 1000 build.log
diff --git a/Makefile.in b/Makefile.in
index c7494f55..895983b4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -46,7 +46,6 @@ all: Makefile build
 # Stuff found by ./configure
 export DATE            := @DATE@
 export LOCAL           := @enable_local@
-export AUTOMATED       := @enable_automated@
 export PROG_SED        := @program_transform_name@
 export PACKAGE_TARNAME := @PACKAGE_TARNAME@
 export VERSION         := @PACKAGE_VERSION@
diff --git a/config/global/logging.in b/config/global/logging.in
index 5fe794d4..0c77e88a 100644
--- a/config/global/logging.in
+++ b/config/global/logging.in
@@ -74,7 +74,7 @@ config LOG_PROGRESS_BAR
     bool
     prompt "Progress bar"
     default y
-    depends on ! LOG_ALL && ! LOG_DEBUG && ! AUTOMATED_BUILD
+    depends on ! LOG_ALL && ! LOG_DEBUG
     help
       If you say 'y' here, you'll be able to see the elapsed time.
       
@@ -104,8 +104,3 @@ config LOG_FILE_COMPRESS
     depends on LOG_TO_FILE
     help
       Compress the log file once the toolchain is successfully built.
-
-config AUTOMATED_BUILD
-    bool
-    default y
-    depends on CONFIGURE_has_automated
diff --git a/configure.ac b/configure.ac
index 5670a03c..adde2abb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,16 +66,6 @@ AC_ARG_ENABLE(
         [--enable-local],
         [do not install, and use current directory])])
 AC_SUBST([enable_local], [${enable_local:-no}])
-AC_ARG_ENABLE(
-    [automated],
-    [AS_HELP_STRING(
-        [--enable-automated],
-        [Tell ct-ng that this is an automated build])],
-        [if test "x$automated" = "x" -o "x$automated" = "xyes"; then
-             automated=y
-         fi])
-AC_SUBST([enable_automated], [${enable_automated:-no}])
-ACX_SET_KCONFIG_OPTION([automated])
 AC_ARG_ENABLE(
     [shared],
     [AS_HELP_STRING(