diff --git a/resources/setup/setup.inc.php b/resources/setup/setup.inc.php
index 91c08f12f7..62c2ee040f 100755
--- a/resources/setup/setup.inc.php
+++ b/resources/setup/setup.inc.php
@@ -13,7 +13,7 @@
 	
 	$setup_info['resources']['name']	= 'resources';
 	$setup_info['resources']['title']	= 'resources';
-	$setup_info['resources']['version']	= '0.0.1.013';
+	$setup_info['resources']['version']	= '0.0.1.015';
 	$setup_info['resources']['app_order']	= 1;
 	$setup_info['resources']['tables']	= array('egw_resources');
 	$setup_info['resources']['enable']	= 1;
@@ -47,3 +47,5 @@
 
 
 
+
+
diff --git a/resources/setup/setup.old.inc.php b/resources/setup/setup.old.inc.php
index c06d82b785..9f1221c98a 100755
--- a/resources/setup/setup.old.inc.php
+++ b/resources/setup/setup.old.inc.php
@@ -13,7 +13,7 @@
 	
 	$setup_info['resources']['name']	= 'resources';
 	$setup_info['resources']['title']	= 'resources';
-	$setup_info['resources']['version']	= '0.0.1.012';
+	$setup_info['resources']['version']	= '0.0.1.014';
 	$setup_info['resources']['app_order']	= 1;
 	$setup_info['resources']['tables']	= array('egw_resources');
 	$setup_info['resources']['enable']	= 1;
@@ -46,3 +46,5 @@
 
 
 
+
+
diff --git a/resources/setup/tables_current.inc.php b/resources/setup/tables_current.inc.php
index 892c4441fd..276b8af651 100755
--- a/resources/setup/tables_current.inc.php
+++ b/resources/setup/tables_current.inc.php
@@ -20,17 +20,15 @@
 				'name' => array('type' => 'varchar','precision' => '100'),
 				'short_description' => array('type' => 'varchar','precision' => '100'),
 				'cat_id' => array('type' => 'int','precision' => '11','nullable' => False),
-				'quantity' => array('type' => 'int','precision' => '11'),
-				'useable' => array('type' => 'int','precision' => '11'),
+				'quantity' => array('type' => 'int','precision' => '11','default' => '1'),
+				'useable' => array('type' => 'int','precision' => '11','default' => '1'),
 				'location' => array('type' => 'varchar','precision' => '100'),
 				'bookable' => array('type' => 'varchar','precision' => '1'),
 				'buyable' => array('type' => 'varchar','precision' => '1'),
 				'prize' => array('type' => 'varchar','precision' => '200'),
 				'long_description' => array('type' => 'longtext'),
-				'picture' => array('type' => 'blob'),
 				'accessories' => array('type' => 'varchar','precision' => '50'),
-				'picture_src' => array('type' => 'varchar','precision' => '20'),
-				'picture_thumb' => array('type' => 'blob')
+				'picture_src' => array('type' => 'varchar','precision' => '20')
 			),
 			'pk' => array('id'),
 			'fk' => array(),
diff --git a/resources/setup/tables_current.old.inc.php b/resources/setup/tables_current.old.inc.php
index a9fcba6cac..d90f2e4913 100755
--- a/resources/setup/tables_current.old.inc.php
+++ b/resources/setup/tables_current.old.inc.php
@@ -27,7 +27,6 @@
 				'buyable' => array('type' => 'varchar','precision' => '1'),
 				'prize' => array('type' => 'varchar','precision' => '200'),
 				'long_description' => array('type' => 'longtext'),
-				'picture' => array('type' => 'blob'),
 				'accessories' => array('type' => 'varchar','precision' => '50'),
 				'picture_src' => array('type' => 'varchar','precision' => '20')
 			),
diff --git a/resources/setup/tables_update.inc.php b/resources/setup/tables_update.inc.php
index 5c3691a352..76d5a920c3 100755
--- a/resources/setup/tables_update.inc.php
+++ b/resources/setup/tables_update.inc.php
@@ -35,4 +35,75 @@
 		$GLOBALS['setup_info']['resources']['currentver'] = '0.0.1.013';
 		return $GLOBALS['setup_info']['resources']['currentver'];
 	}
+
+
+	$test[] = '0.0.1.013';
+	function resources_upgrade0_0_1_013()
+	{
+		$GLOBALS['phpgw_setup']->oProc->DropColumn('egw_resources',array(
+			'fd' => array(
+				'id' => array('type' => 'auto'),
+				'name' => array('type' => 'varchar','precision' => '100'),
+				'short_description' => array('type' => 'varchar','precision' => '100'),
+				'cat_id' => array('type' => 'int','precision' => '11','nullable' => False),
+				'quantity' => array('type' => 'int','precision' => '11'),
+				'useable' => array('type' => 'int','precision' => '11'),
+				'location' => array('type' => 'varchar','precision' => '100'),
+				'bookable' => array('type' => 'varchar','precision' => '1'),
+				'buyable' => array('type' => 'varchar','precision' => '1'),
+				'prize' => array('type' => 'varchar','precision' => '200'),
+				'long_description' => array('type' => 'longtext'),
+				'accessories' => array('type' => 'varchar','precision' => '50'),
+				'picture_src' => array('type' => 'varchar','precision' => '20'),
+				'picture_thumb' => array('type' => 'blob')
+			),
+			'pk' => array('id'),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array()
+		),'picture');
+		$GLOBALS['phpgw_setup']->oProc->DropColumn('egw_resources',array(
+			'fd' => array(
+				'id' => array('type' => 'auto'),
+				'name' => array('type' => 'varchar','precision' => '100'),
+				'short_description' => array('type' => 'varchar','precision' => '100'),
+				'cat_id' => array('type' => 'int','precision' => '11','nullable' => False),
+				'quantity' => array('type' => 'int','precision' => '11'),
+				'useable' => array('type' => 'int','precision' => '11'),
+				'location' => array('type' => 'varchar','precision' => '100'),
+				'bookable' => array('type' => 'varchar','precision' => '1'),
+				'buyable' => array('type' => 'varchar','precision' => '1'),
+				'prize' => array('type' => 'varchar','precision' => '200'),
+				'long_description' => array('type' => 'longtext'),
+				'accessories' => array('type' => 'varchar','precision' => '50'),
+				'picture_src' => array('type' => 'varchar','precision' => '20')
+			),
+			'pk' => array('id'),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array()
+		),'picture_thumb');
+
+		$GLOBALS['setup_info']['resources']['currentver'] = '0.0.1.014';
+		return $GLOBALS['setup_info']['resources']['currentver'];
+	}
+
+
+	$test[] = '0.0.1.014';
+	function resources_upgrade0_0_1_014()
+	{
+		$GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_resources','quantity',array(
+			'type' => 'int',
+			'precision' => '11',
+			'default' => '1'
+		));
+		$GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_resources','useable',array(
+			'type' => 'int',
+			'precision' => '11',
+			'default' => '1'
+		));
+
+		$GLOBALS['setup_info']['resources']['currentver'] = '0.0.1.015';
+		return $GLOBALS['setup_info']['resources']['currentver'];
+	}
 ?>
diff --git a/resources/setup/tables_update.old.inc.php b/resources/setup/tables_update.old.inc.php
index ca0f16fe52..6236ce4ef0 100755
--- a/resources/setup/tables_update.old.inc.php
+++ b/resources/setup/tables_update.old.inc.php
@@ -23,4 +23,68 @@
 		$GLOBALS['setup_info']['resources']['currentver'] = '0.0.1.012';
 		return $GLOBALS['setup_info']['resources']['currentver'];
 	}
+
+
+	$test[] = '0.0.1.012';
+	function resources_upgrade0_0_1_012()
+	{
+		$GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources','picture_thumb',array(
+			'type' => 'blob'
+		));
+
+		$GLOBALS['setup_info']['resources']['currentver'] = '0.0.1.013';
+		return $GLOBALS['setup_info']['resources']['currentver'];
+	}
+
+
+	$test[] = '0.0.1.013';
+	function resources_upgrade0_0_1_013()
+	{
+		$GLOBALS['phpgw_setup']->oProc->DropColumn('egw_resources',array(
+			'fd' => array(
+				'id' => array('type' => 'auto'),
+				'name' => array('type' => 'varchar','precision' => '100'),
+				'short_description' => array('type' => 'varchar','precision' => '100'),
+				'cat_id' => array('type' => 'int','precision' => '11','nullable' => False),
+				'quantity' => array('type' => 'int','precision' => '11'),
+				'useable' => array('type' => 'int','precision' => '11'),
+				'location' => array('type' => 'varchar','precision' => '100'),
+				'bookable' => array('type' => 'varchar','precision' => '1'),
+				'buyable' => array('type' => 'varchar','precision' => '1'),
+				'prize' => array('type' => 'varchar','precision' => '200'),
+				'long_description' => array('type' => 'longtext'),
+				'accessories' => array('type' => 'varchar','precision' => '50'),
+				'picture_src' => array('type' => 'varchar','precision' => '20'),
+				'picture_thumb' => array('type' => 'blob')
+			),
+			'pk' => array('id'),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array()
+		),'picture');
+		$GLOBALS['phpgw_setup']->oProc->DropColumn('egw_resources',array(
+			'fd' => array(
+				'id' => array('type' => 'auto'),
+				'name' => array('type' => 'varchar','precision' => '100'),
+				'short_description' => array('type' => 'varchar','precision' => '100'),
+				'cat_id' => array('type' => 'int','precision' => '11','nullable' => False),
+				'quantity' => array('type' => 'int','precision' => '11'),
+				'useable' => array('type' => 'int','precision' => '11'),
+				'location' => array('type' => 'varchar','precision' => '100'),
+				'bookable' => array('type' => 'varchar','precision' => '1'),
+				'buyable' => array('type' => 'varchar','precision' => '1'),
+				'prize' => array('type' => 'varchar','precision' => '200'),
+				'long_description' => array('type' => 'longtext'),
+				'accessories' => array('type' => 'varchar','precision' => '50'),
+				'picture_src' => array('type' => 'varchar','precision' => '20')
+			),
+			'pk' => array('id'),
+			'fk' => array(),
+			'ix' => array(),
+			'uc' => array()
+		),'picture_thumb');
+
+		$GLOBALS['setup_info']['resources']['currentver'] = '0.0.1.014';
+		return $GLOBALS['setup_info']['resources']['currentver'];
+	}
 ?>