diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/SubCommandOptionHandler.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/SubCommandOptionHandler.java
index 8942654ffd..57cfef4755 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/SubCommandOptionHandler.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/SubCommandOptionHandler.java
@@ -152,7 +152,8 @@ public class SubCommandOptionHandler extends OptionHandler<SubCommand>
     {
       reader = new BufferedReader(
           new InputStreamReader(
-              SubCommand.class.getResourceAsStream(RESOURCE_SERVICES)));
+              SubCommandOptionHandler.class.getResourceAsStream(
+                RESOURCE_SERVICES)));
 
       String line = reader.readLine();
 
diff --git a/scm-clients/scm-cli-client/src/main/resources/META-INF/services/sonia.scm.cli.SubCommand b/scm-clients/scm-cli-client/src/main/resources/META-INF/services/sonia.scm.cli.cmd.SubCommand
similarity index 97%
rename from scm-clients/scm-cli-client/src/main/resources/META-INF/services/sonia.scm.cli.SubCommand
rename to scm-clients/scm-cli-client/src/main/resources/META-INF/services/sonia.scm.cli.cmd.SubCommand
index 7559544a31..79a48a0240 100644
--- a/scm-clients/scm-cli-client/src/main/resources/META-INF/services/sonia.scm.cli.SubCommand
+++ b/scm-clients/scm-cli-client/src/main/resources/META-INF/services/sonia.scm.cli.cmd.SubCommand
@@ -27,4 +27,4 @@
 # http://bitbucket.org/sdorra/scm-manager
 # 
 
-sonia.scm.cli.ListRepositoriesSubCommand
\ No newline at end of file
+sonia.scm.cli.cmd.ListRepositoriesSubCommand
\ No newline at end of file