diff --git a/Rakefile b/Rakefile
index 1e2800556..1f6d4bf2f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -32,6 +32,20 @@ def setup_globals
   $dependency_dir        = "#{c(:top_srcdir)}/rake.d/dependecy.d"
 end
 
+def define_default_task
+  desc "Build everything"
+  targets = $applications.clone
+  targets << "TAGS" if File.exist? "TAGS"
+
+  # Build man pages and translations?
+  if c?(:XSLTPROC_WORKS)
+    targets += $manpages
+    targets += c(:MANPAGES_TRANSLATIONS).split(/\s+/).collect { |language| $manpages.collect { |manpage| manpage.gsub(/man\//, "man/#{language}/") } }.flatten if c?(:PO4A_WORKS)
+  end
+
+  task :default => [ targets, $translations_mos, $htmlhelpbooks ].flatten.compact
+end
+
 # main
 read_config
 adjust_config
@@ -39,10 +53,7 @@ setup_globals
 import_dependencies
 
 # Default task
-desc "Build everything"
-task :default => $applications
-task :default => "TAGS" if File.exist? "TAGS"
-task :default => [ $manpages_dep, $translations_mos, $htmlhelpbooks ]
+define_default_task
 
 # Installation tasks
 desc "Install all applications and support files"
diff --git a/build-config.in b/build-config.in
index b0d028ba5..73f919dbd 100644
--- a/build-config.in
+++ b/build-config.in
@@ -129,10 +129,5 @@ LIBMTXCOMMONDLL=@LIBMTXCOMMONDLL@
 COMPRESSION_LIBRARIES = $(LZO_LIBS) $(BZ2_LIBS)
 
 TRANSLATIONS = @TRANSLATIONS@
-TRANSLATIONS_POS = @TRANSLATIONS_POS@
-
 MANPAGES_TRANSLATIONS = @MANPAGES_TRANSLATIONS@
-MANPAGES_TRANSLATIONS_POS = @MANPAGES_TRANSLATIONS_POS@
-MANPAGES_TRANSLATED = @MANPAGES_TRANSLATED@
-
 GUIDE_TRANSLATIONS = @GUIDE_TRANSLATIONS@
diff --git a/rake.d/config.rb b/rake.d/config.rb
index 666abe44a..6ef56b8ff 100644
--- a/rake.d/config.rb
+++ b/rake.d/config.rb
@@ -26,7 +26,7 @@ end
 def c(idx)
   idx_s = idx.to_s
   var   = (ENV[idx_s].nil? ? $config[idx.to_sym] : ENV[idx_s]).to_s
-  var.gsub(/\$[\({](.*?)[\)}]/) { c($1) }
+  var.gsub(/\$[\({](.*?)[\)}]/) { c($1) }.gsub(/^\s+/, '').gsub(/\s+$/, '')
 end
 
 def c?(idx)