diff --git a/Makefile b/Makefile
index 4de3e076..58c385ca 100644
--- a/Makefile
+++ b/Makefile
@@ -75,6 +75,11 @@ opera: build/$(PACKAGE)
 	cp -r build/$(PACKAGE)/* build/opera/editor
 	cd build/opera ; $(ZIP) ../$(PACKAGE).wgt -r * ; cd ../..
 
+chrome:
+	mkdir -p build/svgedit_app
+	cp -a chrome-app/* build/svgedit_app
+	cd build ; $(ZIP) -r $(PACKAGE)-crx.zip svgedit_app ; rm -rf svgedit_app; cd ..
+
 clean:
 	rm -rf config
 	rm -rf build/$(PACKAGE)
diff --git a/chrome-app/icon_128.png b/chrome-app/icon_128.png
new file mode 100644
index 00000000..964027fe
Binary files /dev/null and b/chrome-app/icon_128.png differ
diff --git a/chrome-app/manifest.json b/chrome-app/manifest.json
new file mode 100644
index 00000000..80dba56d
--- /dev/null
+++ b/chrome-app/manifest.json
@@ -0,0 +1,20 @@
+{
+  "name": "SVG-edit",
+  "description": "A fast, web-based, Javascript-driven SVG editor that works in any modern browser",
+  "version": "2.6",
+  "app": {
+    "urls": [
+      "*://svg-edit.googlecode.com/svn/tags/stable/"
+    ],
+    "launch": {
+      "web_url": "http://svg-edit.googlecode.com/svn/tags/stable/editor/svg-editor.html"
+    }
+  },
+  "icons": {
+    "128": "icon_128.png"
+  },
+  "permissions": [
+    "unlimitedStorage",
+    "notifications"
+  ]
+}