diff --git a/util/src/main/resources/org/killbill/billing/util/ddl.sql b/util/src/main/resources/org/killbill/billing/util/ddl.sql
index 3b67044..7cd9a43 100644
--- a/util/src/main/resources/org/killbill/billing/util/ddl.sql
+++ b/util/src/main/resources/org/killbill/billing/util/ddl.sql
@@ -7,7 +7,7 @@ CREATE TABLE custom_fields (
object_id varchar(36) NOT NULL,
object_type varchar(30) NOT NULL,
is_active boolean default true,
- field_name varchar(30) NOT NULL,
+ field_name varchar(64) NOT NULL,
field_value varchar(255),
created_by varchar(50) NOT NULL,
created_date datetime NOT NULL,
@@ -29,7 +29,7 @@ CREATE TABLE custom_field_history (
object_id varchar(36) NOT NULL,
object_type varchar(30) NOT NULL,
is_active boolean default true,
- field_name varchar(30),
+ field_name varchar(64),
field_value varchar(255),
change_type varchar(6) NOT NULL,
created_by varchar(50) NOT NULL,
diff --git a/util/src/main/resources/org/killbill/billing/util/migration/V20160517224709__increase_field_name_length.sql b/util/src/main/resources/org/killbill/billing/util/migration/V20160517224709__increase_field_name_length.sql
new file mode 100644
index 0000000..f0fbcec
--- /dev/null
+++ b/util/src/main/resources/org/killbill/billing/util/migration/V20160517224709__increase_field_name_length.sql
@@ -0,0 +1,2 @@
+alter table custom_fields modify field_name varchar(64) NOT NULL;
+alter table custom_field_history modify field_name varchar(64);
