diff --git a/phpBB/phpbb/db/migration/data/v310/avatar_types.php b/phpBB/phpbb/db/migration/data/v310/avatar_types.php
new file mode 100644
index 0000000000..439e20889c
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v310/avatar_types.php
@@ -0,0 +1,65 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+namespace phpbb\db\migration\data\v310;
+
+class avatar_types extends \phpbb\db\migration\migration
+{
+	static public function depends_on()
+	{
+		return array(
+			'\phpbb\db\migration\data\v310\dev',
+			'\phpbb\db\migration\data\v310\avatars',
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array($this, 'update_user_avatar_type'))),
+			array('custom', array(array($this, 'update_group_avatar_type'))),
+		);
+	}
+
+	public function update_user_avatar_type()
+	{
+		$sql = 'UPDATE ' . $this->table_prefix . "users
+			SET user_avatar_type = 'avatar.driver.upload'
+			WHERE user_avatar_type = " . AVATAR_UPLOAD;
+		$this->db->sql_query($sql);
+
+		$sql = 'UPDATE ' . $this->table_prefix . "users
+			SET user_avatar_type = 'avatar.driver.remote'
+			WHERE user_avatar_type = " . AVATAR_REMOTE;
+		$this->db->sql_query($sql);
+
+		$sql = 'UPDATE ' . $this->table_prefix . "users
+			SET user_avatar_type = 'avatar.driver.local'
+			WHERE user_avatar_type = " . AVATAR_GALLERY;
+		$this->db->sql_query($sql);
+	}
+
+	public function update_group_avatar_type()
+	{
+		$sql = 'UPDATE ' . $this->table_prefix . "groups
+			SET group_avatar_type = 'avatar.driver.upload'
+			WHERE group_avatar_type = " . AVATAR_UPLOAD;
+		$this->db->sql_query($sql);
+
+		$sql = 'UPDATE ' . $this->table_prefix . "groups
+			SET group_avatar_type = 'avatar.driver.remote'
+			WHERE group_avatar_type = " . AVATAR_REMOTE;
+		$this->db->sql_query($sql);
+
+		$sql = 'UPDATE ' . $this->table_prefix . "groups
+			SET group_avatar_type = 'avatar.driver.local'
+			WHERE group_avatar_type = " . AVATAR_GALLERY;
+		$this->db->sql_query($sql);
+	}
+}