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..74a96c6
--- /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);
+alter table custom_field_history modify field_name varchar(64);