diff --git a/cmd/restic/cmd_find.go b/cmd/restic/cmd_find.go
new file mode 100644
index 000000000..c38ba54a9
--- /dev/null
+++ b/cmd/restic/cmd_find.go
@@ -0,0 +1,115 @@
+package main
+
+import (
+	"errors"
+	"fmt"
+	"path/filepath"
+
+	"github.com/restic/restic"
+	"github.com/restic/restic/backend"
+)
+
+func init() {
+	commands["find"] = commandFind
+}
+
+type findResult struct {
+	node *restic.Node
+	path string
+}
+
+func findInTree(ch *restic.ContentHandler, id backend.ID, path, pattern string) ([]findResult, error) {
+	debug("checking tree %v\n", id)
+
+	tree, err := restic.LoadTree(ch, id)
+	if err != nil {
+		return nil, err
+	}
+
+	results := []findResult{}
+	for _, node := range tree {
+		m, err := filepath.Match(pattern, node.Name)
+		if err != nil {
+			return nil, err
+		}
+
+		debug("  testing entry %q: %v\n", node.Name, m)
+
+		if m {
+			results = append(results, findResult{node: node, path: path})
+		}
+
+		if node.Type == "dir" {
+			subdirResults, err := findInTree(ch, node.Subtree, filepath.Join(path, node.Name), pattern)
+			if err != nil {
+				return nil, err
+			}
+
+			results = append(results, subdirResults...)
+		}
+	}
+
+	return results, nil
+}
+
+func findInSnapshot(be backend.Server, key *restic.Key, id backend.ID, pattern string) error {
+	debug("searching in snapshot %v\n", id)
+
+	ch, err := restic.NewContentHandler(be, key)
+	if err != nil {
+		return err
+	}
+
+	sn, err := ch.LoadSnapshot(id)
+	if err != nil {
+		return err
+	}
+
+	results, err := findInTree(ch, sn.Tree, "", pattern)
+	if err != nil {
+		return err
+	}
+
+	if len(results) == 0 {
+		return nil
+	}
+
+	fmt.Printf("found %d matching entries in snapshot %s\n", len(results), id)
+	for _, res := range results {
+		res.node.Name = filepath.Join(res.path, res.node.Name)
+		fmt.Printf("  %s\n", res.node)
+	}
+
+	return nil
+}
+
+func commandFind(be backend.Server, key *restic.Key, args []string) error {
+	if len(args) == 0 {
+		return errors.New("usage: find PATTERN [snapshot-id]")
+	}
+
+	pattern := args[0]
+	if len(args) == 2 {
+		snapshotID, err := backend.FindSnapshot(be, args[1])
+		if err != nil {
+			return fmt.Errorf("invalid id %q: %v", args[1], err)
+		}
+
+		return findInSnapshot(be, key, snapshotID, pattern)
+	}
+
+	list, err := be.List(backend.Snapshot)
+	if err != nil {
+		return err
+	}
+
+	for _, snapshotID := range list {
+		err := findInSnapshot(be, key, snapshotID, pattern)
+
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}