diff --git a/cacti-0.8.7g-mysql55-type.patch b/cacti-0.8.7g-mysql55-type.patch
new file mode 100644
index 0000000..a072820
--- /dev/null
+++ b/cacti-0.8.7g-mysql55-type.patch
@@ -0,0 +1,434 @@
+--- cacti.sql.orig	2011-08-05 11:47:34.989751169 +0200
++++ cacti.sql	2011-08-05 11:48:09.725480526 +0200
+@@ -7,7 +7,7 @@
+   hash varchar(32) NOT NULL default '',
+   name varchar(255) NOT NULL default '',
+   PRIMARY KEY  (id)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `cdef`
+@@ -33,7 +33,7 @@
+   value varchar(150) NOT NULL default '',
+   PRIMARY KEY  (id),
+   KEY cdef_id (cdef_id)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `cdef_items`
+@@ -64,7 +64,7 @@
+   id mediumint(8) unsigned NOT NULL auto_increment,
+   hex varchar(6) NOT NULL default '',
+   PRIMARY KEY  (id)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `colors`
+@@ -184,7 +184,7 @@
+   type_id tinyint(2) NOT NULL default '0',
+   PRIMARY KEY (id),
+   KEY name (name)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `data_input`
+@@ -214,7 +214,7 @@
+   value text,
+   PRIMARY KEY (data_input_field_id,data_template_data_id),
+   KEY t_value (t_value)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `data_input_data`
+@@ -418,7 +418,7 @@
+   PRIMARY KEY  (id),
+   KEY data_input_id (data_input_id),
+   KEY type_code (type_code)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `data_input_fields`
+@@ -482,7 +482,7 @@
+   snmp_query_id mediumint(8) NOT NULL default '0',
+   snmp_index varchar(255) NOT NULL default '',
+   PRIMARY KEY  (id)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `data_local`
+@@ -503,7 +503,7 @@
+   hash varchar(32) NOT NULL default '',
+   name varchar(150) NOT NULL default '',
+   PRIMARY KEY  (id)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `data_template`
+@@ -573,7 +573,7 @@
+   PRIMARY KEY  (id),
+   KEY local_data_id (local_data_id),
+   KEY data_template_id (data_template_id)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `data_template_data`
+@@ -635,7 +635,7 @@
+   rra_id mediumint(8) unsigned NOT NULL default '0',
+   PRIMARY KEY  (data_template_data_id,rra_id),
+   KEY data_template_data_id (data_template_data_id)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `data_template_data_rra`
+@@ -852,7 +852,7 @@
+   KEY local_data_id (local_data_id),
+   KEY data_template_id (data_template_id),
+   KEY local_data_template_rrd_id (local_data_template_rrd_id)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `data_template_rrd`
+@@ -936,7 +936,7 @@
+   KEY graph_template_id (graph_template_id),
+   KEY snmp_query_id (snmp_query_id),
+   KEY snmp_index (snmp_index)
+-) TYPE=MyISAM COMMENT='Creates a relationship for each item in a custom graph.';
++) ENGINE=MyISAM COMMENT='Creates a relationship for each item in a custom graph.';
+ 
+ --
+ -- Dumping data for table `graph_local`
+@@ -959,7 +959,7 @@
+   description text,
+   column_name varchar(50) NOT NULL default '',
+   PRIMARY KEY  (id)
+-) TYPE=MyISAM COMMENT='Stores the names for graph item input groups.';
++) ENGINE=MyISAM COMMENT='Stores the names for graph item input groups.';
+ 
+ --
+ -- Dumping data for table `graph_template_input`
+@@ -1052,7 +1052,7 @@
+   graph_template_item_id int(12) unsigned NOT NULL default '0',
+   PRIMARY KEY  (graph_template_input_id,graph_template_item_id),
+   KEY graph_template_input_id (graph_template_input_id)
+-) TYPE=MyISAM COMMENT='Stores the relationship for what graph iitems are associated';
++) ENGINE=MyISAM COMMENT='Stores the relationship for what graph iitems are associated';
+ 
+ --
+ -- Dumping data for table `graph_template_input_defs`
+@@ -1326,7 +1326,7 @@
+   name char(255) NOT NULL default '',
+   PRIMARY KEY  (id),
+   KEY name (name)
+-) TYPE=MyISAM COMMENT='Contains each graph template name.';
++) ENGINE=MyISAM COMMENT='Contains each graph template name.';
+ 
+ --
+ -- Dumping data for table `graph_templates`
+@@ -1376,7 +1376,7 @@
+   name varchar(100) NOT NULL default '',
+   gprint_text varchar(255) default NULL,
+   PRIMARY KEY  (id)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `graph_templates_gprint`
+@@ -1438,7 +1438,7 @@
+   KEY local_graph_id (local_graph_id),
+   KEY graph_template_id (graph_template_id),
+   KEY title_cache (title_cache)
+-) TYPE=MyISAM COMMENT='Stores the actual graph data.';
++) ENGINE=MyISAM COMMENT='Stores the actual graph data.';
+ 
+ --
+ -- Dumping data for table `graph_templates_graph`
+@@ -1507,7 +1507,7 @@
+   KEY graph_template_id (graph_template_id),
+   KEY local_graph_id (local_graph_id),
+   KEY task_item_id (task_item_id)
+-) TYPE=MyISAM COMMENT='Stores the actual graph item data.';
++) ENGINE=MyISAM COMMENT='Stores the actual graph item data.';
+ 
+ --
+ -- Dumping data for table `graph_templates_item`
+@@ -1803,7 +1803,7 @@
+   sort_type tinyint(3) unsigned NOT NULL default '1',
+   name varchar(255) NOT NULL default '',
+   PRIMARY KEY  (id)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `graph_tree`
+@@ -1830,7 +1830,7 @@
+   KEY host_id (host_id),
+   KEY local_graph_id (local_graph_id),
+   KEY order_key (order_key)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `graph_tree_items`
+@@ -1879,7 +1879,7 @@
+   availability decimal(8,5) NOT NULL default '100.00000',
+   PRIMARY KEY  (id),
+   KEY disabled (disabled)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `host`
+@@ -1895,7 +1895,7 @@
+   host_id mediumint(8) unsigned NOT NULL default '0',
+   graph_template_id mediumint(8) unsigned NOT NULL default '0',
+   PRIMARY KEY  (host_id,graph_template_id)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `host_graph`
+@@ -1923,7 +1923,7 @@
+   KEY field_name (field_name),
+   KEY field_value (field_value),
+   KEY snmp_query_id (snmp_query_id)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `host_snmp_cache`
+@@ -1942,7 +1942,7 @@
+   reindex_method tinyint(3) unsigned NOT NULL default '0',
+   PRIMARY KEY  (host_id,snmp_query_id),
+   KEY host_id (host_id)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `host_snmp_query`
+@@ -1959,7 +1959,7 @@
+   hash varchar(32) NOT NULL default '',
+   name varchar(100) NOT NULL default '',
+   PRIMARY KEY  (id)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `host_template`
+@@ -1982,7 +1982,7 @@
+   graph_template_id mediumint(8) unsigned NOT NULL default '0',
+   PRIMARY KEY  (host_template_id,graph_template_id),
+   KEY host_template_id (host_template_id)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `host_template_graph`
+@@ -2012,7 +2012,7 @@
+   snmp_query_id mediumint(8) unsigned NOT NULL default '0',
+   PRIMARY KEY  (host_template_id,snmp_query_id),
+   KEY host_template_id (host_template_id)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `host_template_snmp_query`
+@@ -2042,7 +2042,7 @@
+   ip_address int(11) unsigned NOT NULL default '0',
+   last_update datetime NOT NULL default '0000-00-00 00:00:00',
+   PRIMARY KEY  (id)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `poller`
+@@ -2059,7 +2059,7 @@
+   action tinyint(3) unsigned NOT NULL default '0',
+   command varchar(200) NOT NULL default '',
+   PRIMARY KEY  (poller_id,action,command)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `poller_command`
+@@ -2099,7 +2099,7 @@
+   KEY host_id (host_id),
+   KEY rrd_next_step (rrd_next_step),
+   KEY action (action)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `poller_item`
+@@ -2116,7 +2116,7 @@
+   time datetime NOT NULL default '0000-00-00 00:00:00',
+   output text NOT NULL,
+   PRIMARY KEY  (local_data_id,rrd_name,time)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `poller_output`
+@@ -2135,7 +2135,7 @@
+   assert_value varchar(100) NOT NULL default '',
+   arg1 varchar(255) NOT NULL default '',
+   PRIMARY KEY  (host_id,data_query_id,arg1)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `poller_reindex`
+@@ -2153,7 +2153,7 @@
+   start_time datetime NOT NULL default '0000-00-00 00:00:00',
+   end_time datetime NOT NULL default '0000-00-00 00:00:00',
+   PRIMARY KEY  (id)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `poller_time`
+@@ -2173,7 +2173,7 @@
+   rows int(12) NOT NULL default '600',
+   timespan int(12) unsigned NOT NULL default '0',
+   PRIMARY KEY  (id)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `rra`
+@@ -2194,7 +2194,7 @@
+   consolidation_function_id smallint(5) unsigned NOT NULL default '0',
+   PRIMARY KEY  (rra_id,consolidation_function_id),
+   KEY rra_id (rra_id)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `rra_cf`
+@@ -2219,7 +2219,7 @@
+   name varchar(50) NOT NULL default '',
+   value varchar(255) NOT NULL default '',
+   PRIMARY KEY  (name)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `settings`
+@@ -2235,7 +2235,7 @@
+   name varchar(50) NOT NULL default '',
+   value varchar(255) NOT NULL default '',
+   PRIMARY KEY  (user_id,name)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `settings_graphs`
+@@ -2251,7 +2251,7 @@
+   graph_tree_item_id mediumint(8) unsigned NOT NULL default '0',
+   status tinyint(1) NOT NULL default '0',
+   PRIMARY KEY  (user_id,graph_tree_item_id)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `settings_tree`
+@@ -2272,7 +2272,7 @@
+   data_input_id mediumint(8) unsigned NOT NULL default '0',
+   PRIMARY KEY  (id),
+   KEY name (name)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `snmp_query`
+@@ -2298,7 +2298,7 @@
+   name varchar(100) NOT NULL default '',
+   graph_template_id mediumint(8) unsigned NOT NULL default '0',
+   PRIMARY KEY  (id)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `snmp_query_graph`
+@@ -2336,7 +2336,7 @@
+   PRIMARY KEY  (snmp_query_graph_id,data_template_id,data_template_rrd_id),
+   KEY data_template_rrd_id (data_template_rrd_id),
+   KEY snmp_query_graph_id (snmp_query_graph_id)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `snmp_query_graph_rrd`
+@@ -2397,7 +2397,7 @@
+   PRIMARY KEY  (id),
+   KEY snmp_query_graph_id (snmp_query_graph_id),
+   KEY data_template_id (data_template_id)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `snmp_query_graph_rrd_sv`
+@@ -2476,7 +2476,7 @@
+   text varchar(255) NOT NULL default '',
+   PRIMARY KEY  (id),
+   KEY snmp_query_graph_id (snmp_query_graph_id)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `snmp_query_graph_sv`
+@@ -2548,7 +2548,7 @@
+   KEY username (username),
+   KEY realm (realm),
+   KEY enabled (enabled)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `user_auth`
+@@ -2567,7 +2567,7 @@
+   type tinyint(2) unsigned NOT NULL default '0',
+   PRIMARY KEY  (user_id,item_id,type),
+   KEY user_id (user_id,type)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `user_auth_perms`
+@@ -2583,7 +2583,7 @@
+   user_id mediumint(8) unsigned NOT NULL default '0',
+   PRIMARY KEY  (realm_id,user_id),
+   KEY user_id (user_id)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `user_auth_realm`
+@@ -2619,7 +2619,7 @@
+   ip varchar(40) NOT NULL default '',
+   PRIMARY KEY  (username,user_id,time),
+   KEY username (username)
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `user_log`
+@@ -2632,7 +2632,7 @@
+ 
+ CREATE TABLE version (
+   cacti char(20) default NULL
+-) TYPE=MyISAM;
++) ENGINE=MyISAM;
+ 
+ --
+ -- Dumping data for table `version`
diff --git a/cacti.spec b/cacti.spec
index b68ee0e..2700368 100644
--- a/cacti.spec
+++ b/cacti.spec
@@ -1,6 +1,6 @@
 Name: cacti
 Version: 0.8.7g
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: An rrd based graphing tool
 
 Group: Applications/System
@@ -11,6 +11,7 @@ Source0: http://www.cacti.net/downloads/%{name}-%{version}.tar.gz
 Source1: cacti-httpd.conf
 Source2: cacti.logrotate
 Source3: cacti.README.Fedora
+Patch0:  cacti-0.8.7g-mysql55-type.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -31,6 +32,8 @@ used to creating traffic graphs with MRTG.
 %prep
 %setup -q
 
+%patch0 -p0
+
 echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
 
 %install
@@ -105,6 +108,9 @@ fi
 %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
 
 %changelog
+* Mon Aug 08 2011 Jon Ciesla <limb@jcomserv.net> - 0.8.7g-3
+- Patch for MySQL 5.5, BZ 728513.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.7g-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild