diff --git a/frontend/gulpfile-img64.js b/frontend/gulpfile-img64.js
index aaed2756..a21b7130 100644
--- a/frontend/gulpfile-img64.js
+++ b/frontend/gulpfile-img64.js
@@ -32,7 +32,9 @@ module.exports = function() {
 		}
 
 		if (file.isBuffer()) {
-			var $ = cheerio.load(String(file.contents));
+			var $ = cheerio.load(String(file.contents), {
+				xmlMode: mime.lookup(file.path) == "application/xml"
+			});
 
 			$('img').each(function() {
 				$(this).attr('src', replacePath($(this).attr('src'), file));
@@ -42,6 +44,10 @@ module.exports = function() {
 				$(this).attr('href', replacePath($(this).attr('href'), file));
 			});
 
+			$('OpenSearchDescription Image').each(function() {
+				$(this).text(replacePath($(this).text(), file));
+			});
+
 			file.contents = new Buffer($.html());
 
 			return callback(null, file);
diff --git a/frontend/gulpfile.js b/frontend/gulpfile.js
index ad184731..c050e535 100644
--- a/frontend/gulpfile.js
+++ b/frontend/gulpfile.js
@@ -107,7 +107,10 @@ gulp.task("all", [ "deps", "app" ], function() {
 				concat("all.css"),
 				sourcemaps.write("./sourcemaps")
 			),
-			gulp.src("deref.html")
+			combine(
+				gulp.src([ "deref.html", "opensearch.xml" ]),
+				img64()
+			)
 		),
 		gulp.dest("build")
 	);
diff --git a/frontend/index.html b/frontend/index.html
index 7aaaf837..bad6e934 100644
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -6,6 +6,7 @@
 		<meta name="robots" content="index,nofollow" />
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
 		<link rel="shortcut icon" href="assets/img/favicon.png">
+		<link rel="search" type="application/opensearchdescription+xml" title="FacilMap" href="https://facilmap.org/opensearch.xml">
 		<!-- inject:css -->
 		<!-- endinject -->
 		<style type="text/css">
diff --git a/frontend/opensearch.xml b/frontend/opensearch.xml
new file mode 100644
index 00000000..7c9e0233
--- /dev/null
+++ b/frontend/opensearch.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:moz="http://www.mozilla.org/2006/browser/search/">
+	<ShortName>FacilMap</ShortName>
+	<Description>A fully-featured OpenStreetMap-based map where markers and lines can be added with live collaboration.</Description>
+	<Image width="16" height="16" type="image/png">assets/img/favicon.png</Image>
+	<Url type="text/html" template="https://facilmap.org/#q={searchTerms}" />
+	<moz:SearchForm>https://facilmap.org/</moz:SearchForm>
+</OpenSearchDescription>