diff --git a/app-text/xapian-omega/xapian-omega-1.3.5-r1.ebuild b/app-text/xapian-omega/xapian-omega-1.3.5-r2.ebuild
similarity index 69%
rename from app-text/xapian-omega/xapian-omega-1.3.5-r1.ebuild
rename to app-text/xapian-omega/xapian-omega-1.3.5-r2.ebuild
index 3f920a904f0e3..0ec1697bd188d 100644
--- a/app-text/xapian-omega/xapian-omega-1.3.5-r1.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.3.5-r2.ebuild
@@ -27,9 +27,22 @@ src_prepare() {
 src_install () {
 	emake DESTDIR="${D}" install
 
+	doenvd "${T}"/20xapian-omega
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+
 	#move docs to /usr/share/doc/${PF}.
 	mv "${D}/usr/share/doc/xapian-omega" "${D}/usr/share/doc/${PF}" || die
 
-	doenvd "${T}"/20xapian-omega
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+	# Directory containing Xapian databases:
+	keepdir /var/lib/omega/data
+
+	# Directory containing OmegaScript templates:
+	keepdir /var/lib/omega/templates
+	mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
+
+	# Directory to write Omega logs to:
+	keepdir /var/log/omega
+
+	# Directory containing any cdb files for the $lookup OmegaScript command:
+	keepdir /var/lib/omega/cdb
 }