diff --git a/plugins/locsearch/Makefile.am b/plugins/locsearch/Makefile.am
new file mode 100644
index 0000000..1bcf6bf
--- /dev/null
+++ b/plugins/locsearch/Makefile.am
@@ -0,0 +1,13 @@
+# nrgh
+plugindir = $(PLUGINDIR)
+plugin_PYTHON = locsearch.py
+
+plugin_in_files = locsearch.rb-plugin.in
+%.rb-plugin: %.rb-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+
+plugin_DATA = $(plugin_in_files:.rb-plugin.in=.rb-plugin)
+
+EXTRA_DIST = $(plugin_in_files) locsearch.py
+
+CLEANFILES = $(plugin_DATA)
+DISTCLEANFILES = $(plugin_DATA)
diff --git a/plugins/locsearch/locsearch.py b/plugins/locsearch/locsearch.py
new file mode 100644
index 0000000..534a99a
--- /dev/null
+++ b/plugins/locsearch/locsearch.py
@@ -0,0 +1,31 @@
+import rhythmdb, rb
+import gobject, gtk
+
+class LocationSearchPlugin(rb.Plugin):
+	def __init__(self):
+		rb.Plugin.__init__(self)
+
+	def get_search_actions_cb(self, header, source):
+		return ("LocationPluginSearch",)
+
+	def activate(self, shell):
+		self.id = shell.props.source_header.connect('get-search-actions', self.get_search_actions_cb)
+
+		self.ag = gtk.ActionGroup('LocationSearchPluginActions')
+		action = gtk.RadioAction('LocationPluginSearch', 'Location', 'Location', None, 0)
+		self.ag.add_action(action)
+
+		self.search = rb.SourceSearchBasic(rhythmdb.PROP_LOCATION)
+		self.search.action_attach(action)
+
+		shell.props.ui_manager.insert_action_group(self.ag, 0)
+
+		shell.props.source_header.emit('refresh-search-bar')
+
+	def deactivate(self, shell):
+		shell.props.source_header.disconnect(self.id)
+		self.id = 0
+
+		shell.props.ui_manager.remove_action_group(self.ag)
+		self.ag = None
+		self.search = None
diff --git a/plugins/locsearch/locsearch.rb-plugin.in b/plugins/locsearch/locsearch.rb-plugin.in
new file mode 100644
index 0000000..a1e2dec
--- /dev/null
+++ b/plugins/locsearch/locsearch.rb-plugin.in
@@ -0,0 +1,9 @@
+[RB Plugin]
+Loader=python
+Module=locsearch
+IAge=1
+_Name=Location search
+_Description=adds 'location' search action
+Authors=Jonathan Matthew
+Copyright=Copyright © 2008 Jonathan Matthew
+Website=http://www.rhythmbox.org/
