diff --git a/src/rocket_api.rs b/src/rocket_api.rs
index a190525..883bbff 100644
--- a/src/rocket_api.rs
+++ b/src/rocket_api.rs
@@ -29,6 +29,8 @@ pub fn get_routes() -> Vec<rocket::Route> {
 		flatten,
 		random,
 		recent,
+		search_root,
+		search,
 	]
 }
 
@@ -202,3 +204,15 @@ fn recent(db: State<DB>, _auth: Auth) -> Result<(Json<Vec<index::Directory>>), e
 	let result = index::get_recent_albums::<DB>(&db, 20)?;
 	Ok(Json(result))
 }
+
+#[get("/search")]
+fn search_root(db: State<DB>, _auth: Auth) -> Result<(Json<Vec<index::CollectionFile>>), errors::Error> {
+	let result = index::search::<DB>(&db, "")?;
+	Ok(Json(result))
+}
+
+#[get("/search/<query>")]
+fn search(db: State<DB>, _auth: Auth, query: String) -> Result<(Json<Vec<index::CollectionFile>>), errors::Error> {
+	let result = index::search::<DB>(&db, &query)?;
+	Ok(Json(result))
+}