diff --git a/lib/command/cli.php b/lib/command/cli.php
index 9d1b3e8dd..09a87e415 100644
--- a/lib/command/cli.php
+++ b/lib/command/cli.php
@@ -13,7 +13,17 @@
 {
   $autoload = dirname(__FILE__).'/../../autoload.php';
 }
-require_once $autoload;
+
+// Fall back to classic Symfony loading
+if (!file_exists($autoload))
+{
+  require_once(dirname(__FILE__).'/../autoload/sfCoreAutoload.class.php');
+  sfCoreAutoload::register();
+}
+else
+{
+  require_once $autoload;
+}
 
 try
 {
diff --git a/package.xml.tmpl b/package.xml.tmpl
index 5cf94f3dc..5c1144fc1 100644
--- a/package.xml.tmpl
+++ b/package.xml.tmpl
@@ -40,10 +40,10 @@
 
    <file role="script" baseinstalldir="/" name="data/bin/symfony.bat" />
 
-   <file role="doc" baseinstalldir="symfony" name="CHANGELOG" />
-   <file role="doc" baseinstalldir="symfony" name="COPYRIGHT" />
-   <file role="doc" baseinstalldir="symfony" name="LICENSE" />
-   <file role="doc" baseinstalldir="symfony" name="README" />
+   <file role="doc" baseinstalldir="symfony" name="CHANGELOG.md" />
+   <file role="doc" baseinstalldir="symfony" name="COPYRIGHT.md" />
+   <file role="doc" baseinstalldir="symfony" name="LICENSE.md" />
+   <file role="doc" baseinstalldir="symfony" name="README.md" />
    <file role="doc" baseinstalldir="symfony" name="licenses/LICENSE.ICU" />
    <file role="doc" baseinstalldir="symfony" name="licenses/LICENSE.lime" />
    <file role="doc" baseinstalldir="symfony" name="licenses/LICENSE.prado" />