diff --git a/services/src/main/java/io/druid/cli/Version.java b/services/src/main/java/io/druid/cli/Version.java
index 0ec5298a1bf..89306fc42fc 100644
--- a/services/src/main/java/io/druid/cli/Version.java
+++ b/services/src/main/java/io/druid/cli/Version.java
@@ -1,3 +1,22 @@
+/*
+ * Druid - a distributed column store.
+ * Copyright (C) 2012, 2013  Metamarkets Group Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
 package io.druid.cli;
 
 import io.airlift.command.Command;
@@ -5,41 +24,41 @@ import io.druid.initialization.DruidModule;
 import io.druid.initialization.Initialization;
 import io.druid.server.initialization.ExtensionsConfig;
 
+import java.lang.StringBuilder;
+
 @Command(
     name = "version",
     description = "Returns Druid version information"
 )
-public class Version implements Runnable {
+public class Version implements Runnable
+{
+  private static final String NL = "\n";
   @Override
   public void run()
   {
-    System.out.println("Druid version " + Initialization.class.getPackage().getImplementationVersion());
+    StringBuilder output = new StringBuilder();
+    output.append("Druid version ").append(NL);
+    output.append(Initialization.class.getPackage().getImplementationVersion()).append(NL).append(NL);
 
     ExtensionsConfig config = Initialization.makeStartupInjector().getInstance(ExtensionsConfig.class);
 
-    System.out.println("");
-    System.out.println("Registered Druid Modules");
+    output.append("Registered Druid Modules").append(NL);
+
     for (DruidModule module : Initialization.getFromExtensions(config, DruidModule.class)) {
       String artifact = module.getClass().getPackage().getImplementationTitle();
       String version = module.getClass().getPackage().getImplementationVersion();
 
-      if(artifact != null) {
-        System.out.println(
-            String.format(
-                "  - %s (%s-%s)",
-                module.getClass().getCanonicalName(),
-                module.getClass().getPackage().getImplementationTitle(),
-                module.getClass().getPackage().getImplementationVersion()
-            )
-        );
+      if (artifact != null) {
+        output.append(
+            String.format("  - %s (%s-%s)", module.getClass().getCanonicalName(), artifact, version)
+        ).append(NL);
       } else {
-        System.out.println(
-                  String.format(
-                      "  - %s",
-                      module.getClass().getCanonicalName()
-                  )
-              );
+        output.append(
+            String.format("  - %s", module.getClass().getCanonicalName())
+        ).append(NL);
       }
     }
+
+    System.out.println(output.toString());
   }
 }