diff --git a/db_structure.xml b/db_structure.xml
index c7b7ffec60160d58b1a66b422893477f470cf0f9..6efcf497cf75a41685899908dd664cce1b4370da 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -104,8 +104,8 @@
 
 			<field>
 				<name>available</name>
-				<type>boolean</type>
-				<default>true</default>
+				<type>integer</type>
+				<default>1</default>
 				<notnull>true</notnull>
 			</field>
 
diff --git a/lib/private/files/cache/storage.php b/lib/private/files/cache/storage.php
index 338d8308281c9bfe65807b27c017bb6a95bb6009..a116e84b3f2af43971982b94267c6c99f581157e 100644
--- a/lib/private/files/cache/storage.php
+++ b/lib/private/files/cache/storage.php
@@ -58,7 +58,8 @@ class Storage {
 			$this->numericId = $row['numeric_id'];
 		} else {
 			$connection = \OC_DB::getConnection();
-			if ($connection->insertIfNotExist('*PREFIX*storages', ['id' => $this->storageId, 'available' => $isAvailable])) {
+			$available = $isAvailable ? 1 : 0;
+			if ($connection->insertIfNotExist('*PREFIX*storages', ['id' => $this->storageId, 'available' => $available])) {
 				$this->numericId = \OC_DB::insertid('*PREFIX*storages');
 			} else {
 				if ($row = self::getStorageById($this->storageId)) {
@@ -141,7 +142,7 @@ class Storage {
 	public function getAvailability() {
 		if ($row = self::getStorageById($this->storageId)) {
 			return [
-				'available' => $row['available'],
+				'available' => ($row['available'] === 1),
 				'last_checked' => $row['last_checked']
 			];
 		} else {
@@ -154,7 +155,8 @@ class Storage {
 	 */
 	public function setAvailability($isAvailable) {
 		$sql = 'UPDATE `*PREFIX*storages` SET `available` = ?, `last_checked` = ? WHERE `id` = ?';
-		\OC_DB::executeAudited($sql, array($isAvailable, time(), $this->storageId));
+		$available = $isAvailable ? 1 : 0;
+		\OC_DB::executeAudited($sql, array($available, time(), $this->storageId));
 	}
 
 	/**
diff --git a/version.php b/version.php
index a6b49d9dc7419fb93cf25fbf4b0b25a11237950c..cfc4db82995d15413404c631214e20230f1947a9 100644
--- a/version.php
+++ b/version.php
@@ -23,7 +23,7 @@
 // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
-$OC_Version = [8, 2, 0, 4];
+$OC_Version = [8, 2, 0, 5];
 
 // The human readable string
 $OC_VersionString = '8.2 pre alpha';