diff --git a/doc/Horde/Controller/COPYING b/LICENSE
similarity index 100%
rename from doc/Horde/Controller/COPYING
rename to LICENSE
diff --git a/package.xml b/package.xml
index f7cdd6a..ca273a3 100644
--- a/package.xml
+++ b/package.xml
@@ -17,7 +17,7 @@
   <email>chuck@horde.org</email>
   <active>yes</active>
  </lead>
- <date>2016-02-01</date>
+ <date>2017-10-17</date>
  <version>
   <release>2.0.5</release>
   <api>1.0.0</api>
@@ -32,13 +32,6 @@
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
-   <dir name="doc">
-    <dir name="Horde">
-     <dir name="Controller">
-      <file name="COPYING" role="doc" />
-     </dir> <!-- /doc/Horde/Controller -->
-    </dir> <!-- /doc/Horde -->
-   </dir> <!-- /doc -->
    <dir name="lib">
     <dir name="Horde">
      <dir name="Controller">
@@ -87,6 +80,7 @@
      </dir> <!-- /test/Horde/Controller -->
     </dir> <!-- /test/Horde -->
    </dir> <!-- /test -->
+   <file name="LICENSE" role="doc" />
   </dir> <!-- / -->
  </contents>
  <dependencies>
@@ -153,29 +147,29 @@
  </dependencies>
  <phprelease>
   <filelist>
-   <install as="COPYING" name="doc/Horde/Controller/COPYING" />
    <install as="Horde/Controller.php" name="lib/Horde/Controller.php" />
    <install as="Horde/Controller/Base.php" name="lib/Horde/Controller/Base.php" />
    <install as="Horde/Controller/Exception.php" name="lib/Horde/Controller/Exception.php" />
+   <install as="Horde/Controller/Filter/Gzip.php" name="lib/Horde/Controller/Filter/Gzip.php" />
    <install as="Horde/Controller/FilterCollection.php" name="lib/Horde/Controller/FilterCollection.php" />
    <install as="Horde/Controller/FilterRunner.php" name="lib/Horde/Controller/FilterRunner.php" />
    <install as="Horde/Controller/Null.php" name="lib/Horde/Controller/Null.php" />
    <install as="Horde/Controller/PostFilter.php" name="lib/Horde/Controller/PostFilter.php" />
    <install as="Horde/Controller/PreFilter.php" name="lib/Horde/Controller/PreFilter.php" />
    <install as="Horde/Controller/Request.php" name="lib/Horde/Controller/Request.php" />
-   <install as="Horde/Controller/RequestConfiguration.php" name="lib/Horde/Controller/RequestConfiguration.php" />
-   <install as="Horde/Controller/Response.php" name="lib/Horde/Controller/Response.php" />
-   <install as="Horde/Controller/ResponseWriter.php" name="lib/Horde/Controller/ResponseWriter.php" />
-   <install as="Horde/Controller/Runner.php" name="lib/Horde/Controller/Runner.php" />
-   <install as="Horde/Controller/SettingsExporter.php" name="lib/Horde/Controller/SettingsExporter.php" />
-   <install as="Horde/Controller/UrlWriter.php" name="lib/Horde/Controller/UrlWriter.php" />
-   <install as="Horde/Controller/Filter/Gzip.php" name="lib/Horde/Controller/Filter/Gzip.php" />
    <install as="Horde/Controller/Request/Http.php" name="lib/Horde/Controller/Request/Http.php" />
    <install as="Horde/Controller/Request/Mock.php" name="lib/Horde/Controller/Request/Mock.php" />
    <install as="Horde/Controller/Request/Null.php" name="lib/Horde/Controller/Request/Null.php" />
+   <install as="Horde/Controller/RequestConfiguration.php" name="lib/Horde/Controller/RequestConfiguration.php" />
+   <install as="Horde/Controller/Response.php" name="lib/Horde/Controller/Response.php" />
+   <install as="Horde/Controller/ResponseWriter.php" name="lib/Horde/Controller/ResponseWriter.php" />
    <install as="Horde/Controller/ResponseWriter/Web.php" name="lib/Horde/Controller/ResponseWriter/Web.php" />
    <install as="Horde/Controller/ResponseWriter/WebDebug.php" name="lib/Horde/Controller/ResponseWriter/WebDebug.php" />
+   <install as="Horde/Controller/Runner.php" name="lib/Horde/Controller/Runner.php" />
+   <install as="Horde/Controller/SettingsExporter.php" name="lib/Horde/Controller/SettingsExporter.php" />
    <install as="Horde/Controller/SettingsExporter/Default.php" name="lib/Horde/Controller/SettingsExporter/Default.php" />
+   <install as="Horde/Controller/UrlWriter.php" name="lib/Horde/Controller/UrlWriter.php" />
+   <install as="LICENSE" name="LICENSE" />
    <install as="Horde/Controller/AllTests.php" name="test/Horde/Controller/AllTests.php" />
    <install as="Horde/Controller/bootstrap.php" name="test/Horde/Controller/bootstrap.php" />
    <install as="Horde/Controller/FilterRunnerTest.php" name="test/Horde/Controller/FilterRunnerTest.php" />
@@ -414,7 +408,7 @@
    <stability>
     <release>stable</release>
     <api>stable</api></stability>
-   <date>2016-02-01</date>
+   <date>2017-10-17</date>
    <license uri="http://www.horde.org/licenses/bsd">BSD-2-Clause</license>
    <notes>
 *