diff --git a/composer.json b/composer.json
index 2cda860..ab26288 100644
--- a/composer.json
+++ b/composer.json
@@ -16,8 +16,8 @@
             "role": "lead"
         }
     ],
-    "version": "3.0.9",
-    "time": "2016-12-16",
+    "version": "3.0.10",
+    "time": "2017-06-23",
     "repositories": [
         {
             "type": "pear",
@@ -25,31 +25,40 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0,<=6.0.0alpha1",
-        "pear-pear.horde.org/horde": ">=5.0.0@stable,<=6.0.0alpha1@stable",
-        "pear-pear.horde.org/Horde_Auth": ">=2.0.0@stable,<=3.0.0alpha1@stable",
-        "pear-pear.horde.org/Horde_Autoloader": ">=2.0.0@stable,<=3.0.0alpha1@stable",
-        "pear-pear.horde.org/Horde_Compress": ">=2.0.0@stable,<=3.0.0alpha1@stable",
-        "pear-pear.horde.org/Horde_Core": ">=2.0.0@stable,<=3.0.0alpha1@stable",
-        "pear-pear.horde.org/Horde_Date": ">=2.0.0@stable,<=3.0.0alpha1@stable",
-        "pear-pear.horde.org/Horde_Db": ">=2.0.0@stable,<=3.0.0alpha1@stable",
-        "pear-pear.horde.org/Horde_Exception": ">=2.0.0@stable,<=3.0.0alpha1@stable",
-        "pear-pear.horde.org/Horde_Form": ">=2.0.0@stable,<=3.0.0alpha1@stable",
-        "pear-pear.horde.org/Horde_Group": ">=2.0.0@stable,<=3.0.0alpha1@stable",
-        "pear-pear.horde.org/Horde_Mail": ">=2.0.0@stable,<=3.0.0alpha1@stable",
-        "pear-pear.horde.org/Horde_Mime": ">=2.5.0@stable,<=3.0.0alpha1@stable",
-        "pear-pear.horde.org/Horde_Mime_Viewer": ">=2.0.0@stable,<=3.0.0alpha1@stable",
-        "pear-pear.horde.org/Horde_Notification": ">=2.0.0@stable,<=3.0.0alpha1@stable",
-        "pear-pear.horde.org/Horde_Perms": ">=2.0.0@stable,<=3.0.0alpha1@stable",
-        "pear-pear.horde.org/Horde_Prefs": ">=2.0.0@stable,<=3.0.0alpha1@stable",
-        "pear-pear.horde.org/Horde_Scheduler": ">=2.0.0@stable,<=3.0.0alpha1@stable",
-        "pear-pear.horde.org/Horde_Share": ">=2.0.0@stable,<=3.0.0alpha1@stable",
-        "pear-pear.horde.org/Horde_Support": ">=2.0.0@stable,<=3.0.0alpha1@stable",
-        "pear-pear.horde.org/Horde_Text_Filter": ">=2.0.0@stable,<=3.0.0alpha1@stable",
-        "pear-pear.horde.org/Horde_Util": ">=2.0.0@stable,<=3.0.0alpha1@stable",
-        "pear-pear.horde.org/Horde_Vfs": ">=2.0.0@stable,<=3.0.0alpha1@stable",
-        "pear-pear.horde.org/Horde_View": ">=2.0.0@stable,<=3.0.0alpha1@stable",
+        "php": "^5.3",
+        "pear-pear.horde.org/horde": "^5@stable",
+        "pear-pear.horde.org/Horde_Auth": "^2@stable",
+        "pear-pear.horde.org/Horde_Autoloader": "^2@stable",
+        "pear-pear.horde.org/Horde_Compress": "^2@stable",
+        "pear-pear.horde.org/Horde_Core": "^2@stable",
+        "pear-pear.horde.org/Horde_Date": "^2@stable",
+        "pear-pear.horde.org/Horde_Db": "^2@stable",
+        "pear-pear.horde.org/Horde_Exception": "^2@stable",
+        "pear-pear.horde.org/Horde_Form": "^2@stable",
+        "pear-pear.horde.org/Horde_Group": "^2@stable",
+        "pear-pear.horde.org/Horde_Mail": "^2@stable",
+        "pear-pear.horde.org/Horde_Mime": "^2.5@stable",
+        "pear-pear.horde.org/Horde_Mime_Viewer": "^2@stable",
+        "pear-pear.horde.org/Horde_Notification": "^2@stable",
+        "pear-pear.horde.org/Horde_Perms": "^2@stable",
+        "pear-pear.horde.org/Horde_Prefs": "^2@stable",
+        "pear-pear.horde.org/Horde_Scheduler": "^2@stable",
+        "pear-pear.horde.org/Horde_Share": "^2@stable",
+        "pear-pear.horde.org/Horde_Support": "^2@stable",
+        "pear-pear.horde.org/Horde_Text_Filter": "^2@stable",
+        "pear-pear.horde.org/Horde_Util": "^2@stable",
+        "pear-pear.horde.org/Horde_Vfs": "^2@stable",
+        "pear-pear.horde.org/Horde_View": "^2@stable",
         "ext-gettext": "*",
         "ext-json": "*"
+    },
+    "replace": {
+        "pear-pear.horde.org/whups": "3.*",
+        "pear-horde/whups": "3.*"
+    },
+    "autoload": {
+        "psr-0": {
+            "Whups": "lib/"
+        }
     }
 }
diff --git a/docs/CHANGES b/docs/CHANGES
index a26e889..4a9be3c 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -1,6 +1,6 @@
------------
-v3.0.10-git
------------
+-------
+v3.0.10
+-------
 
 [jan] SECURITY: Fix permission check when downloading reports.
 
diff --git a/lib/Application.php b/lib/Application.php
index 0a418c9..4010682 100644
--- a/lib/Application.php
+++ b/lib/Application.php
@@ -36,7 +36,7 @@ class Whups_Application extends Horde_Registry_Application
 {
     /**
      */
-    public $version = 'H5 (3.0.10-git)';
+    public $version = 'H5 (3.0.10)';
 
     /**
      * Global variables defined:
diff --git a/package.xml b/package.xml
index 74f9706..753eb6b 100644
--- a/package.xml
+++ b/package.xml
@@ -16,7 +16,7 @@
   <email>jan@horde.org</email>
   <active>yes</active>
  </lead>
- <date>2016-12-16</date>
+ <date>2017-06-23</date>
  <version>
   <release>3.0.10</release>
   <api>3.0.0</api>
@@ -1243,7 +1243,7 @@
    <stability>
     <release>stable</release>
     <api>stable</api></stability>
-   <date>2016-12-16</date>
+   <date>2017-06-23</date>
    <license uri="http://www.horde.org/licenses/bsdl.php">BSD-2-Clause</license>
    <notes>
 * [jan] SECURITY: Fix permission check when downloading reports.