diff --git a/docs/upgrades/upgrade_6.8.8-6.99.0.pl b/docs/upgrades/upgrade_6.8.8-6.99.0.pl
index af65e0867..d825f5285 100644
--- a/docs/upgrades/upgrade_6.8.8-6.99.0.pl
+++ b/docs/upgrades/upgrade_6.8.8-6.99.0.pl
@@ -681,6 +681,7 @@ create table EventManagementSystem_products (
  maximumAttendees int(11),
  approved tinyint,
  sequenceNumber int(11),
+ imageId varchar(22) binary,
 primary key(productId)
 )
 SQL2
@@ -771,6 +772,7 @@ primary key(badgeId)
 )
 SQL9
 
+	print "\tAdding the Event Management System.\n" unless ($quiet);
 	$session->db->write($sql1);
 	$session->db->write($sql2);
 	$session->db->write($sql3);
diff --git a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
index ad54141e1..1cfe6a978 100644
--- a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
+++ b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
@@ -1564,6 +1564,8 @@ sub www_editEvent {
 	return $self->session->privilege->insufficient unless ($self->canAddEvents);
 
 	my $pid = shift || $self->session->form->get("pid");
+	my ($storageId) = $self->session->db->quickArray("select imageId from EventManagementSystem_products where productId=?",[$pid]) unless ($pid eq "");
+
 	my $i18n = WebGUI::International->new($self->session,'Asset_EventManagementSystem');
 
 	my $event = $self->session->db->quickHashRef("
@@ -1615,6 +1617,13 @@ sub www_editEvent {
 		-label => $i18n->get('add/edit event description')
 	);
 	
+	$f->image(
+		  -name => "image",
+		  -label => "Event Image",
+		  -hoverHelp => "An image representing your event for display to site visitors.",
+		  -value => $storageId
+		 );
+	
 	$f->float(
 		-name  => "price",
 		-value => $self->session->form->get("price") || $event->{price},
@@ -1777,6 +1786,8 @@ sub www_editEventSave {
 	my $pid = $self->session->form->get("pid");
         my $eventIsNew = 1 if ($pid eq "" || $pid eq "new");
         my $event;
+	my $storageId;
+	$storageId = $self->session->form->process("image","image",undef,{name=>"image", value=>$storageId});
 
 	#Save the extended product data
 	$pid = $self->setCollateral("EventManagementSystem_products", "productId",{
@@ -1784,7 +1795,9 @@ sub www_editEventSave {
 		startDate  => $self->session->form->process("startDate",'dateTime'),
 		endDate	=> $self->session->form->process("endDate",'dateTime'),
 		maximumAttendees => $self->session->form->get("maximumAttendees"),
-		approved	=> $self->session->form->get("approved")
+		approved	=> $self->session->form->get("approved"),
+		imageId		=> $storageId
+
 	},1,1);
 
 	#Save the event metadata