diff --git a/docs/upgrades/upgrade_7.6.3-7.6.4.pl b/docs/upgrades/upgrade_7.6.3-7.6.4.pl
index 7915cb68f..6ad6c6d57 100644
--- a/docs/upgrades/upgrade_7.6.3-7.6.4.pl
+++ b/docs/upgrades/upgrade_7.6.3-7.6.4.pl
@@ -331,11 +331,11 @@ sub migrateSurvey{
 
         #move over survey
         $session->db->write("insert into Survey
-            values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",
+            values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)",
             [
                 $$survey{groupToTakeSurvey},$$survey{groupToViewReports},'PBtmpl0000000000000064','PBtmpl0000000000000063',$$survey{maxResponsesPerUser},
                 $$survey{gradebookTemplateId},$$survey{assetId},'PBtmpl0000000000000061',$$survey{revisionDate},'GRUNFctldUgop-qRLuo_DA','AjhlNO3wZvN5k4i4qioWcg',
-                'wAc4azJViVTpo-2NYOXWvg', '1oBRscNIcFOI-pETrCOspA','d8jMMMRddSQ7twP4l1ZSIw','CxMpE_UPauZA3p8jdrOABw','','{}'
+                'wAc4azJViVTpo-2NYOXWvg', '1oBRscNIcFOI-pETrCOspA','d8jMMMRddSQ7twP4l1ZSIw','CxMpE_UPauZA3p8jdrOABw','','{}',0
             ]
         );
 
@@ -459,6 +459,7 @@ CREATE TABLE `Survey` (
   `surveyQuestionsId` char(22) default NULL,
   `exitURL` varchar(512) default NULL,
   `surveyJSON` longblob,
+  `timeLimit` mediumint(8) unsigned NOT NULL,
   PRIMARY KEY  (`assetId`,`revisionDate`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 "); 
diff --git a/lib/WebGUI/Asset/Wobject/Survey.pm b/lib/WebGUI/Asset/Wobject/Survey.pm
index eca5e75ba..2fd56f028 100644
--- a/lib/WebGUI/Asset/Wobject/Survey.pm
+++ b/lib/WebGUI/Asset/Wobject/Survey.pm
@@ -39,6 +39,12 @@ sub definition {
             hoverHelp    => "A Survey System",
             label        => "Template ID"
         },
+        timeLimit => { fieldType => 'integer',
+            defaultValue => 0,
+            tab => 'properties',
+            hoverHelp => $i18n->get('timelimit hoverHelp'),
+            label => $i18n->get('timelimit') 
+        },
         groupToEditSurvey => {
             fieldType    => 'group',
             defaultValue => 4,
diff --git a/lib/WebGUI/i18n/English/Asset_Survey.pm b/lib/WebGUI/i18n/English/Asset_Survey.pm
index 31990f64d..af3180db9 100644
--- a/lib/WebGUI/i18n/English/Asset_Survey.pm
+++ b/lib/WebGUI/i18n/English/Asset_Survey.pm
@@ -235,6 +235,15 @@ our $I18N = {
 		message => q|Checked|,
 		lastUpdated => 1224686319
 	},
+	'timelimit' => {
+		message => q|Time Limit:|,
+		lastUpdated => 1224686319
+	},
+	'timelimit hoverHelp' => {
+		message => q|How many minutes the user has to finish the server from the moment they start.  0 means unlimited time.|,
+		lastUpdated => 1224686319
+	},
+    
 };
 
 1;