diff --git a/server/feedsaver-server.go b/server/feedsaver-server.go
new file mode 100644
index 0000000000000000000000000000000000000000..99097b8d72dc0404443b7e56a69e8a60db671b19
--- /dev/null
+++ b/server/feedsaver-server.go
@@ -0,0 +1,20 @@
+package main
+
+import (
+	"flag"
+	"autistici.org/feedsaver"
+)
+
+var (
+	addr = flag.String("addr", ":5000", "TCP address to listen on")
+	storage_root = flag.String("storage_dir", "./tmp", "Root of the storage directory")
+)
+
+func main() {
+	flag.Parse()
+
+	storage := feedsaver.NewStorage(*storage_root)
+
+	feed := feedsaver.NewFeedsaver(storage)
+	feed.Run(*addr)
+}