diff --git a/MDB2/Date.php b/MDB2/Date.php
index 5fee913e..9fa7e1a2 100644
--- a/MDB2/Date.php
+++ b/MDB2/Date.php
@@ -122,7 +122,7 @@ public static function date2Mdbstamp(
         $day = null,
         $year = null
     ) {
-        return MDB2_Date::unix2Mdbstamp(mktime($hour, $minute, $second, $month, $day, $year, -1));
+        return MDB2_Date::unix2Mdbstamp(mktime($hour, $minute, $second, $month, $day, $year));
     }
 
     // }}}
@@ -153,7 +153,7 @@ public static function mdbstamp2Unix($mdb_timestamp)
     {
         $arr = MDB2_Date::mdbstamp2Date($mdb_timestamp);
 
-        return mktime($arr['hour'], $arr['minute'], $arr['second'], $arr['month'], $arr['day'], $arr['year'], -1);
+        return mktime($arr['hour'], $arr['minute'], $arr['second'], $arr['month'], $arr['day'], $arr['year']);
     }
 
     // }}}
diff --git a/composer.json b/composer.json
index 311838c0..41ab904d 100644
--- a/composer.json
+++ b/composer.json
@@ -19,11 +19,17 @@
   "require-dev": {
     "silverorange/coding-standard": "^1.0.0"
   },
+  "replace": {
+    "pear-pear.php.net/mdb2": "2.*"
+  },
   "autoload": {
     "psr-0": {
       "MDB2": ""
     }
   },
+  "include-path": [
+    "./"
+  ],
   "scripts": {
     "lint": "./vendor/bin/phpcs",
     "post-install-cmd": "./vendor/bin/phpcs --config-set installed_paths vendor/silverorange/coding-standard/src",