diff --git a/do_all_you_can_do.pl b/do_all_you_can_do.pl
index 3d49f2d..3dd0b32 100644
--- a/do_all_you_can_do.pl
+++ b/do_all_you_can_do.pl
@@ -27,12 +27,14 @@
 my $elasticsearch;
 my $opac_base_url;
 my $intranet_base_url;
+my $marcflavour = 'MARC21';
 
 GetOptions(
     'elasticsearch'       => \$elasticsearch,
     'instance=s'          => \$instance,
     'intranet-base-url=s' => \$intranet_base_url,
     'koha_dir=s'          => \$koha_dir,
+	'marcflavour=s'       => \$marcflavour,
     'opac-base-url=s'     => \$opac_base_url,
     'password=s'          => \$password,
     'userid=s'            => \$userid
@@ -50,12 +52,19 @@
 $opac_base_url //= 'catalogue.kohadev.vm';
 $intranet_base_url //= 'pro.kohadev.vm';
 
+$marcflavour = uc($marcflavour);
+
+if (     $marcflavour ne 'MARC21'
+     and $marcflavour ne 'UNIMARC' ) {
+    die "Invalid MARC flavour '$marcflavour' passed.";
+}
+
 my $misc_dir = dirname( abs_path( $0 ) );
 
 my ( $cmd, $success, $error_code, $full_buf, $stdout_buf, $stderr_buf );
 my $PERL5LIB = $ENV{PERL5LIB};
 
-$cmd = "sudo koha-shell $instance -p -c 'PERL5LIB=$PERL5LIB perl $misc_dir/populate_db.pl -v --opac-base-url $opac_base_url --intranet-base-url $intranet_base_url'";
+$cmd = "sudo koha-shell $instance -p -c 'PERL5LIB=$PERL5LIB perl $misc_dir/populate_db.pl -v --opac-base-url $opac_base_url --intranet-base-url $intranet_base_url --marcflavour $marcflavour'";
 ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) = run( command => $cmd, verbose => 1 );
 exit(1) unless $success;
 $cmd = "sudo koha-shell $instance -p -c 'PERL5LIB=$PERL5LIB perl $misc_dir/create_superlibrarian.pl $create_superlibrarian_opts'";