diff --git a/opal-server/src/main/tools/shiro-hasher b/opal-server/src/main/tools/shiro-hasher
index 9f3ed85530..a3b7bc626f 100644
--- a/opal-server/src/main/tools/shiro-hasher
+++ b/opal-server/src/main/tools/shiro-hasher
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-java -jar hasher/lib/shiro-tools-hasher-${shiro.version}-cli.jar $@
\ No newline at end of file
+java -jar "$(dirname "$0")/hasher/lib/shiro-tools-hasher-${shiro.version}-cli.jar" "$@"
diff --git a/opal-server/src/main/tools/shiro-hasher.bat b/opal-server/src/main/tools/shiro-hasher.bat
index 9aef6f4ce7..33f108958b 100644
--- a/opal-server/src/main/tools/shiro-hasher.bat
+++ b/opal-server/src/main/tools/shiro-hasher.bat
@@ -1 +1 @@
-java -jar hasher\lib\shiro-tools-hasher-${shiro.version}-cli.jar %*
\ No newline at end of file
+java -jar "%~dp0hasher\lib\shiro-tools-hasher-${shiro.version}-cli.jar" %*
diff --git a/opal-shell/src/main/java/org/obiba/opal/shell/commands/FileBundleCommand.java b/opal-shell/src/main/java/org/obiba/opal/shell/commands/FileBundleCommand.java
new file mode 100644
index 0000000000..25f02b713d
--- /dev/null
+++ b/opal-shell/src/main/java/org/obiba/opal/shell/commands/FileBundleCommand.java
@@ -0,0 +1,14 @@
+package org.obiba.opal.shell.commands;
+
+
+import org.obiba.opal.shell.commands.options.FileBundleCommandOptions;
+
+@CommandUsage(description = "Prepare a file bundle.",
+    syntax = "Syntax: file-bundle --path PATH [--password PASSWORD]")
+public class FileBundleCommand extends AbstractOpalRuntimeDependentCommand<FileBundleCommandOptions> {
+
+  @Override
+  public int execute() {
+    return 0;
+  }
+}
diff --git a/opal-shell/src/main/java/org/obiba/opal/shell/commands/options/FileBundleCommandOptions.java b/opal-shell/src/main/java/org/obiba/opal/shell/commands/options/FileBundleCommandOptions.java
new file mode 100644
index 0000000000..b1e4200964
--- /dev/null
+++ b/opal-shell/src/main/java/org/obiba/opal/shell/commands/options/FileBundleCommandOptions.java
@@ -0,0 +1,13 @@
+package org.obiba.opal.shell.commands.options;
+
+import uk.co.flamingpenguin.jewel.cli.CommandLineInterface;
+import uk.co.flamingpenguin.jewel.cli.Option;
+
+@CommandLineInterface(application = "file-bundle")
+public interface FileBundleCommandOptions extends HelpOption {
+  @Option(shortName = "z", description = "The file or folder path to bundle to a zip archive.")
+  String getPath();
+  @Option(shortName = "p", description = "The password to use to encrypt the file bundle.")
+  String getPassword();
+  boolean isPassword();
+}
diff --git a/opal-shell/src/main/java/org/obiba/opal/shell/web/FileBundleCommandOptionsImpl.java b/opal-shell/src/main/java/org/obiba/opal/shell/web/FileBundleCommandOptionsImpl.java
new file mode 100644
index 0000000000..b4e4211a80
--- /dev/null
+++ b/opal-shell/src/main/java/org/obiba/opal/shell/web/FileBundleCommandOptionsImpl.java
@@ -0,0 +1,36 @@
+package org.obiba.opal.shell.web;
+
+import com.google.common.base.Strings;
+import org.obiba.opal.shell.commands.options.FileBundleCommandOptions;
+
+public class FileBundleCommandOptionsImpl implements FileBundleCommandOptions {
+
+  private final String path;
+
+  private final String password;
+
+  public FileBundleCommandOptionsImpl(String path, String password) {
+    this.path = path;
+    this.password = password;
+  }
+
+  @Override
+  public String getPath() {
+    return path;
+  }
+
+  @Override
+  public String getPassword() {
+    return password;
+  }
+
+  @Override
+  public boolean isPassword() {
+    return !Strings.isNullOrEmpty(password);
+  }
+
+  @Override
+  public boolean isHelp() {
+    return false;
+  }
+}
diff --git a/opal-shell/src/main/java/org/obiba/opal/shell/web/WebShellCommandRegistry.java b/opal-shell/src/main/java/org/obiba/opal/shell/web/WebShellCommandRegistry.java
index 5a8d028495..4692146161 100644
--- a/opal-shell/src/main/java/org/obiba/opal/shell/web/WebShellCommandRegistry.java
+++ b/opal-shell/src/main/java/org/obiba/opal/shell/web/WebShellCommandRegistry.java
@@ -23,7 +23,6 @@
 public class WebShellCommandRegistry extends AbstractCommandRegistry {
 
   public WebShellCommandRegistry() {
-
     addAvailableCommand(ImportCommand.class, ImportCommandOptions.class);
     addAvailableCommand(CopyCommand.class, CopyCommandOptions.class);
     addAvailableCommand("export", CopyCommand.class, CopyCommandOptions.class);
@@ -35,5 +34,6 @@ public WebShellCommandRegistry() {
     addAvailableCommand(ExportVCFCommand.class, ExportVCFCommandOptions.class);
     addAvailableCommand("r-packages", RPackagesCommand.class, RPackagesCommandOptions.class);
     addAvailableCommand("r-package", RPackageCommand.class, RPackageCommandOptions.class);
+    addAvailableCommand("file-bundle", FileBundleCommand.class, FileBundleCommandOptions.class);
   }
 }
diff --git a/pom.xml b/pom.xml
index 26025ae619..47c6a5b4be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,7 +93,7 @@
     <mysql-connector-j.version>8.4.0</mysql-connector-j.version>
     <nimbus-jose-jwt.version>10.0.2</nimbus-jose-jwt.version>
     <oauth-oidc-sdk.version>11.12</oauth-oidc-sdk.version>
-    <obiba-commons.version>5.1.1</obiba-commons.version>
+    <obiba-commons.version>5.1.2</obiba-commons.version>
     <opal-oda.version>1.2.3</opal-oda.version>
     <opencsv.version>2.3</opencsv.version>
     <orientdb.version>3.2.45</orientdb.version>