diff --git a/templates/LocalSettings_vhost.php.erb b/templates/LocalSettings_vhost.php.erb
index 18cde4a..c93cb03 100644
--- a/templates/LocalSettings_vhost.php.erb
+++ b/templates/LocalSettings_vhost.php.erb
@@ -1,176 +1,182 @@
 <?php
 # This file is managed by puppet. Local modifications will be overwritten.
 #
 # This file was automatically generated by the MediaWiki 1.19.20+dfsg-0+deb7u3
 # installer. If you make manual changes, please keep track in case you
 # need to recreate them later.
 #
 # See includes/DefaultSettings.php for all configurable settings
 # and their default values, but don't forget to make changes in _this_
 # file, not there.
 #
 # Further documentation for configuration settings may be found at:
 # http://www.mediawiki.org/wiki/Manual:Configuration_settings
 
 # Protect against web entry
 if ( !defined( 'MEDIAWIKI' ) ) {
 	exit;
 }
 
 ## Uncomment this to disable output compression
 # $wgDisableOutputCompression = true;
 
 $wgSitename      = "SoftwareHeritage";
 
 ## The URL base path to the directory containing the wiki;
 ## defaults for all runtime URL paths are based off of this.
 ## For more information on customizing the URLs please see:
 ## http://www.mediawiki.org/wiki/Manual:Short_URL
 $wgScriptPath       = "";
 $wgScriptExtension  = ".php";
 
 ## The protocol and server name to use in fully-qualified URLs
 $wgServer           = "https://<%= @vhost_name %>";
 
 ## The relative URL path to the skins directory
 $wgStylePath        = "$wgScriptPath/skins";
 
 ## The relative URL path to the logo.  Make sure you change this from the default,
 ## or else you'll overwrite your logo when you upgrade!
 $wgLogo             = "<%= @swh_logo %>";
 $wgFavicon          = "<%= @swh_logo %>";
 
 ## UPO means: this is also a user preference option
 
 $wgEnableEmail      = true;
 $wgEnableUserEmail  = true; # UPO
 
 $wgEmergencyContact = "info@softwareheritage.org";
 $wgPasswordSender   = "info@softwareheritage.org";
 
 $wgEnotifUserTalk      = true; # UPO
 $wgEnotifWatchlist     = true; # UPO
 $wgEmailAuthentication = true;
 $wgEmailConfirmToEdit  = true;  # require email confirmation before editing
 
 ## Database settings
 $wgDBtype           = "mysql";
 $wgDBserver         = "<%= @db_host %>";
 $wgDBname           = "<%= @db_basename %>";
 $wgDBuser           = "<%= @db_user %>";
 $wgDBpassword       = "<%= @db_password %>";
 
 # MySQL specific settings
 $wgDBprefix         = "";
 
 # MySQL table options to use during installation or update
 $wgDBTableOptions   = "ENGINE=InnoDB, DEFAULT CHARSET=binary";
 
 # Experimental charset support for MySQL 5.0.
 $wgDBmysql5 = false;
 
 ## Shared memory settings
 $wgMainCacheType    = CACHE_NONE;
 $wgMemCachedServers = array();
 
 ## To enable image uploads, make sure the 'images' directory
 ## is writable, then set this to true:
 $wgEnableUploads  = true;
 $wgUseImageMagick = true;
 $wgImageMagickConvertCommand = "/usr/bin/convert";
 
 # InstantCommons allows wiki to use images from http://commons.wikimedia.org
 $wgUseInstantCommons  = false;
 
 ## If you use ImageMagick (or any other shell command) on a
 ## Linux server, this will need to be set to the name of an
 ## available UTF-8 locale
 $wgShellLocale = "en_US.utf8";
 
 ## If you want to use image uploads under safe mode,
 ## create the directories images/archive, images/thumb and
 ## images/temp, and make them all writable. Then uncomment
 ## this, if it's not already uncommented:
 #$wgHashedUploadDirectory = false;
 
 ## Set $wgCacheDirectory to a writable directory on the web server
 ## to make your wiki go slightly faster. The directory should not
 ## be publically accessible from the web.
 #$wgCacheDirectory = "$IP/cache";
 
 # Site language code, should be one of the list in ./languages/Names.php
 $wgLanguageCode = "en";
 
 $wgSecretKey = "<%= @secret_key %>";
 
 # Site upgrade key. Must be set to a string (default provided) to turn on the
 # web installer while LocalSettings.php is in place
 $wgUpgradeKey = "<%= @upgrade_key %>";
 
 ## Default skin: you can change the default skin. Use the internal symbolic
 ## names, ie 'standard', 'nostalgia', 'cologneblue', 'monobook', 'vector':
 $wgDefaultSkin = "vector";
 
 ## For attaching licensing metadata to pages, and displaying an
 ## appropriate copyright notice / icon. GNU Free Documentation
 ## License and Creative Commons licenses are supported so far.
 $wgRightsPage = ""; # Set to the title of a wiki page that describes your license/copyright
 $wgRightsUrl  = "https://creativecommons.org/licenses/by-sa/4.0/";
 $wgRightsText = "Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0) License";
 $wgRightsIcon = "https://licensebuttons.net/l/by-sa/4.0/88x31.png";
 
 # Path to the GNU diff3 utility. Used for conflict resolution.
 $wgDiff3 = "/usr/bin/diff3";
 
 # debian-specific include:
 if (is_file("/etc/mediawiki-extensions/extensions.php")) {
 	include("/etc/mediawiki-extensions/extensions.php");
 }
 
 # Query string length limit for ResourceLoader. You should only set this if
 # your web server has a query string length limit (then set it to that limit),
 # or if you have suhosin.get.max_value_length set in php.ini (then set it to
 # that value)
 $wgResourceLoaderMaxQueryLength = -1;
 
 
 # Anti-SPAM Q&A
 $wgCaptchaQuestions[] = array( 'question' => "The name of this project is Software [BLANK] (fill the blank)",
                                'answer'   => "heritage" );
 $wgCaptchaQuestions[] = array( 'question' => "The name of this project is [BLANK] Heritage (fill the blank)",
                                'answer'   => "software" );
 $wgCaptchaQuestions[] = array( 'question' => "What do we collect, preserve, and share?",
                                'answer'   => array( "software", "source code", "software source code" ) );
-$wgCaptchaQuestions[] = array( 'question' => "17 + 25 ?",
-                               'answer' => "42" );
-$wgCaptchaQuestions[] = array( 'question' => "18 - 1 ?",
-                               'answer' => "17" );
-$wgCaptchaQuestions[] = array( 'question' => "22 + 1 ?",
-                               'answer' => "23" );
+$wgCaptchaQuestions[] = array( 'question' => "Our headquarters are located in the capital of France, which is ...?",
+                               'answer' => "paris" );
+$wgCaptchaQuestions[] = array( 'question' => "Name a popular GNU/Linux distribution",
+                               'answer' => array( "arch", "centos", "debian", "fedora", "gentoo", "mageia",
+                                                  "mandriva", "mint", "opensuse", "red hat", "redhat", "slackware",
+                                                  "suse", "ubuntu" ) );
+$wgCaptchaQuestions[] = array( 'question' => "Name a popular programming language",
+                               'answer' => array( "ada", "assembly", "c", "c#", "c++", "erlang", "f#", "fortran",
+                                                  "go", "haskell", "java", "javascript", "lisp", "logo", "lua", "ml",
+                                                  "objective c", "objective-c", "ocaml", "pascal", "perl", "php",
+                                                  "prolog", "python", "ruby", "rust", "scala", "scheme", "shell",
+                                                  "swift", "visual basic" ) );
 
 
 # End of automatically generated settings.
 # Add more configuration options below.
 
 $wgGroupPermissions['*']['edit'] = false;
 
 $wgFileExtensions[] = 'pdf';
 
 $wgNamespacesToBeSearchedDefault = array(
 	NS_MAIN =>           true,
 	NS_TALK =>           true,
 	NS_USER =>           true,
 	NS_USER_TALK =>      true,
 	NS_PROJECT =>        true,
 	NS_PROJECT_TALK =>   true,
 	NS_FILE =>           true,
 	NS_FILE_TALK =>      true,
 	NS_MEDIAWIKI =>      true,
 	NS_MEDIAWIKI_TALK => true,
 	NS_TEMPLATE =>       true,
 	NS_TEMPLATE_TALK =>  true,
 	NS_HELP =>           true,
 	NS_HELP_TALK =>      true,
 	NS_CATEGORY =>       true,
 	NS_CATEGORY_TALK =>  true
 );