diff --git a/CHANGE-LOG b/CHANGE-LOG
index 5fb835a7d0..e9384c82e0 100644
--- a/CHANGE-LOG
+++ b/CHANGE-LOG
@@ -12,6 +12,7 @@ Phoronix Test Suite (Git)
 - phoromatic: Add universal search functionality from web interface
 - phoromatic: Improve formatting of annotations
 - phoromatic: Mark system state as unknown when communication fails and hits the event server check
+- phoromatic: Don't attempt to open DB in read-only mode if phoromatic.db not yet made
 
 Phoronix Test Suite 5.6 Milestone 5
 11 March 2015
diff --git a/pts-core/objects/phoromatic_server.php b/pts-core/objects/phoromatic_server.php
index 4e9058b753..a06517d576 100644
--- a/pts-core/objects/phoromatic_server.php
+++ b/pts-core/objects/phoromatic_server.php
@@ -84,9 +84,9 @@ public static function prepare_database($read_only = false)
 		}
 
 		$db_file = self::phoromatic_path() . 'phoromatic.db';
-
 		$db_flags = SQLITE3_OPEN_READWRITE | SQLITE3_OPEN_CREATE;
-		if($read_only)
+
+		if($read_only && is_file($db_file))
 		{
 			$db_flags = SQLITE3_OPEN_READONLY;
 		}
@@ -94,8 +94,10 @@ public static function prepare_database($read_only = false)
 		self::$db = new SQLite3($db_file, $db_flags);
 		self::$db->busyTimeout(5000);
 
-		if($read_only)
+		if($read_only && is_file($db_file))
+		{
 			return true;
+		}
 
 		switch(self::read_database_version())
 		{