diff --git a/doc/Horde/Stream/COPYING b/LICENSE
similarity index 100%
rename from doc/Horde/Stream/COPYING
rename to LICENSE
diff --git a/package.xml b/package.xml
index 7e3ef43..6e56157 100644
--- a/package.xml
+++ b/package.xml
@@ -10,7 +10,7 @@
   <email>slusarz@horde.org</email>
   <active>yes</active>
  </lead>
- <date>2016-02-02</date>
+ <date>2017-10-17</date>
  <version>
   <release>1.6.4</release>
   <api>1.6.0</api>
@@ -25,13 +25,6 @@
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
-   <dir name="doc">
-    <dir name="Horde">
-     <dir name="Stream">
-      <file name="COPYING" role="doc" />
-     </dir> <!-- /doc/Horde/Stream -->
-    </dir> <!-- /doc/Horde -->
-   </dir> <!-- /doc -->
    <dir name="lib">
     <dir name="Horde">
      <dir name="Stream">
@@ -61,6 +54,7 @@
      </dir> <!-- /test/Horde/Stream -->
     </dir> <!-- /test/Horde -->
    </dir> <!-- /test -->
+   <file name="LICENSE" role="doc" />
   </dir> <!-- / -->
  </contents>
  <dependencies>
@@ -107,13 +101,13 @@
  </dependencies>
  <phprelease>
   <filelist>
-   <install as="COPYING" name="doc/Horde/Stream/COPYING" />
    <install as="Horde/Stream.php" name="lib/Horde/Stream.php" />
    <install as="Horde/Stream/Exception.php" name="lib/Horde/Stream/Exception.php" />
    <install as="Horde/Stream/Existing.php" name="lib/Horde/Stream/Existing.php" />
    <install as="Horde/Stream/String.php" name="lib/Horde/Stream/String.php" />
    <install as="Horde/Stream/Temp.php" name="lib/Horde/Stream/Temp.php" />
    <install as="Horde/Stream/TempString.php" name="lib/Horde/Stream/TempString.php" />
+   <install as="LICENSE" name="LICENSE" />
    <install as="Horde/Stream/AllTests.php" name="test/Horde/Stream/AllTests.php" />
    <install as="Horde/Stream/bootstrap.php" name="test/Horde/Stream/bootstrap.php" />
    <install as="Horde/Stream/phpunit.xml" name="test/Horde/Stream/phpunit.xml" />
@@ -123,7 +117,7 @@
    <install as="Horde/Stream/Stream/TempStringTest.php" name="test/Horde/Stream/Stream/TempStringTest.php" />
    <install as="Horde/Stream/Stream/TempTest.php" name="test/Horde/Stream/Stream/TempTest.php" />
    <install as="Horde/Stream/Stream/TestBase.php" name="test/Horde/Stream/Stream/TestBase.php" />
-   </filelist>
+  </filelist>
  </phprelease>
  <changelog>
   <release>
@@ -308,7 +302,7 @@
    <stability>
     <release>stable</release>
     <api>stable</api></stability>
-   <date>2016-02-02</date>
+   <date>2017-10-17</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
 *