diff --git a/airtime_mvc/application/models/Webstream.php b/airtime_mvc/application/models/Webstream.php
index 476ee5490..8c74dca5a 100644
--- a/airtime_mvc/application/models/Webstream.php
+++ b/airtime_mvc/application/models/Webstream.php
@@ -168,6 +168,9 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable
         if ($result == 0) {
             $valid['url'][0] = false;
             $valid['url'][1] = 'URL should be of form "http://domain"';
+        } elseif (strlen($url) > 512) {
+            $valid['url'][0] = false;
+            $valid['url'][1] = 'URL should be 512 characters or less';      
         } else {
 
             try {
diff --git a/airtime_mvc/build/schema.xml b/airtime_mvc/build/schema.xml
index 844452866..b03e14011 100644
--- a/airtime_mvc/build/schema.xml
+++ b/airtime_mvc/build/schema.xml
@@ -420,7 +420,7 @@
     <column name="name" phpName="DbName" type="VARCHAR" size="255" required="true" />
     <!-- TODO, remove hardlimit on this column length? -->
     <column name="description" phpName="DbDescription" type="VARCHAR" size="255" required="true" />
-    <column name="url" phpName="DbUrl" type="VARCHAR" size="255" required="true" />
+    <column name="url" phpName="DbUrl" type="VARCHAR" size="512" required="true" />
     <column name="length" phpName="DbLength" type="VARCHAR" sqlType="interval" required="true" defaultValue="00:00:00"/>
     <column name="creator_id" phpName="DbCreatorId" type="INTEGER" required="true" />
     <column name="mtime" phpName="DbMtime" type="TIMESTAMP" size="6" required="true" />
diff --git a/install_minimal/upgrades/airtime-2.2.0/data/upgrade.sql b/install_minimal/upgrades/airtime-2.2.0/data/upgrade.sql
index aad2502f3..c2f8ba70b 100644
--- a/install_minimal/upgrades/airtime-2.2.0/data/upgrade.sql
+++ b/install_minimal/upgrades/airtime-2.2.0/data/upgrade.sql
@@ -95,7 +95,7 @@ CREATE TABLE cc_webstream (
 	id integer DEFAULT nextval('cc_webstream_id_seq'::regclass) NOT NULL,
 	name character varying(255) NOT NULL,
 	description character varying(255) NOT NULL,
-	url character varying(255) NOT NULL,
+	url character varying(512) NOT NULL,
 	length interval DEFAULT '00:00:00'::interval NOT NULL,
 	creator_id integer NOT NULL,
 	mtime timestamp(6) without time zone NOT NULL,