diff -Nru me-tv-1.3.6/debian/changelog me-tv-1.3.6/debian/changelog
--- me-tv-1.3.6/debian/changelog	2012-06-02 08:15:11.000000000 +0000
+++ me-tv-1.3.6/debian/changelog	2012-06-24 14:52:42.000000000 +0000
@@ -1,3 +1,10 @@
+me-tv (1.3.6-1ubuntu0.2) precise-proposed; urgency=low
+
+  * Fix EPG thread related hangs.
+    - Add fix_database_access_problem.diff, cherry-picked from upstream.
+
+ -- Felix Geyer <debfx@ubuntu.com>  Sun, 24 Jun 2012 16:51:30 +0200
+
 me-tv (1.3.6-1ubuntu0.1) precise-proposed; urgency=low
 
   * Fix user interface freezing on startup. (LP: #958751)
diff -Nru me-tv-1.3.6/debian/patches/fix_database_access_problem.diff me-tv-1.3.6/debian/patches/fix_database_access_problem.diff
--- me-tv-1.3.6/debian/patches/fix_database_access_problem.diff	1970-01-01 00:00:00.000000000 +0000
+++ me-tv-1.3.6/debian/patches/fix_database_access_problem.diff	2012-06-24 14:50:53.000000000 +0000
@@ -0,0 +1,48 @@
+=== modified file 'configure.ac'
+--- a/configure.ac	2012-03-22 22:25:54 +0000
++++ b/configure.ac	2012-06-10 21:54:29 +0000
+@@ -120,7 +120,7 @@
+ IT_PROG_INTLTOOL([0.35.0])
+ 
+ # required versions
+-SQLITE_REQUIRED=3.0
++SQLITE_REQUIRED=3.7.0
+ GTKMM_REQUIRED=2.12.0
+ GIOMM_REQUIRED=2.10.0
+ GCONF_REQUIRED=2.0
+
+=== modified file 'src/data.cc'
+--- a/src/data.cc	2012-03-22 22:25:54 +0000
++++ b/src/data.cc	2012-06-10 21:54:29 +0000
+@@ -74,6 +74,7 @@
+ 	{
+ 		throw SQLiteException(connection, _("Failed to finalise statement"));
+ 	}
++	statement = NULL;
+ }
+ 
+ void Statement::reset()
+@@ -178,6 +179,22 @@
+ 	}
+ 	
+ 	database_created = !database_exists;
++	
++	// Enable WAL journal
++	Statement* stmnt = new Statement(*this, "PRAGMA journal_mode=WAL");
++	stmnt->step();
++	delete stmnt;
++
++	// Set page size
++	stmnt = new Statement(*this, "PRAGMA page_size=8192");
++	stmnt->step();
++	delete stmnt;
++
++	// Synchronous mode
++	stmnt = new Statement(*this, "PRAGMA synchronous=NORMAL");
++	stmnt->step();
++	delete stmnt;
++	
+ }
+ 
+ Connection::~Connection()
+
diff -Nru me-tv-1.3.6/debian/patches/series me-tv-1.3.6/debian/patches/series
--- me-tv-1.3.6/debian/patches/series	2012-06-02 07:49:56.000000000 +0000
+++ me-tv-1.3.6/debian/patches/series	2012-06-24 14:52:41.000000000 +0000
@@ -1 +1,2 @@
 fix_ui_freeze.diff
+fix_database_access_problem.diff