diff --git a/Makefile b/Makefile
index 148b41c..a811767 100644
--- a/Makefile
+++ b/Makefile
@@ -109,15 +109,19 @@ dist:
 		$(PACKAGE)-$(VERSION)/src/plugins/Makefile \
 		$(PACKAGE)-$(VERSION)/src/plugins/project.conf \
 		$(PACKAGE)-$(VERSION)/src/plugins/16x16/Makefile \
+		$(PACKAGE)-$(VERSION)/src/plugins/16x16/phone-n900.png \
 		$(PACKAGE)-$(VERSION)/src/plugins/16x16/phone-openmoko.png \
 		$(PACKAGE)-$(VERSION)/src/plugins/16x16/project.conf \
 		$(PACKAGE)-$(VERSION)/src/plugins/24x24/Makefile \
+		$(PACKAGE)-$(VERSION)/src/plugins/24x24/phone-n900.png \
 		$(PACKAGE)-$(VERSION)/src/plugins/24x24/phone-openmoko.png \
 		$(PACKAGE)-$(VERSION)/src/plugins/24x24/project.conf \
 		$(PACKAGE)-$(VERSION)/src/plugins/32x32/Makefile \
+		$(PACKAGE)-$(VERSION)/src/plugins/32x32/phone-n900.png \
 		$(PACKAGE)-$(VERSION)/src/plugins/32x32/phone-openmoko.png \
 		$(PACKAGE)-$(VERSION)/src/plugins/32x32/project.conf \
 		$(PACKAGE)-$(VERSION)/src/plugins/48x48/Makefile \
+		$(PACKAGE)-$(VERSION)/src/plugins/48x48/phone-n900.png \
 		$(PACKAGE)-$(VERSION)/src/plugins/48x48/phone-openmoko.png \
 		$(PACKAGE)-$(VERSION)/src/plugins/48x48/project.conf \
 		$(PACKAGE)-$(VERSION)/tools/engineering.c \
diff --git a/src/plugins/16x16/Makefile b/src/plugins/16x16/Makefile
index 725cfaa..2c05e9c 100644
--- a/src/plugins/16x16/Makefile
+++ b/src/plugins/16x16/Makefile
@@ -12,10 +12,13 @@ clean:
 distclean: clean
 
 install:
+	$(MKDIR) $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps
+	$(INSTALL) -m 0644 -- phone-n900.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/phone-n900.png
 	$(MKDIR) $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps
 	$(INSTALL) -m 0644 -- phone-openmoko.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/phone-openmoko.png
 
 uninstall:
+	$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/phone-n900.png
 	$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/phone-openmoko.png
 
 .PHONY: all clean distclean install uninstall
diff --git a/src/plugins/16x16/phone-n900.png b/src/plugins/16x16/phone-n900.png
new file mode 100644
index 0000000..0b49d28
Binary files /dev/null and b/src/plugins/16x16/phone-n900.png differ
diff --git a/src/plugins/16x16/project.conf b/src/plugins/16x16/project.conf
index 799af87..da30c84 100644
--- a/src/plugins/16x16/project.conf
+++ b/src/plugins/16x16/project.conf
@@ -1,4 +1,7 @@
-dist=Makefile,phone-openmoko.png
+dist=Makefile,phone-n900.png,phone-openmoko.png
+
+[phone-n900.png]
+install=$(PREFIX)/share/icons/hicolor/16x16/apps
 
 [phone-openmoko.png]
 install=$(PREFIX)/share/icons/hicolor/16x16/apps
diff --git a/src/plugins/24x24/Makefile b/src/plugins/24x24/Makefile
index 34fe8eb..7ec3b01 100644
--- a/src/plugins/24x24/Makefile
+++ b/src/plugins/24x24/Makefile
@@ -12,10 +12,13 @@ clean:
 distclean: clean
 
 install:
+	$(MKDIR) $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps
+	$(INSTALL) -m 0644 -- phone-n900.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/phone-n900.png
 	$(MKDIR) $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps
 	$(INSTALL) -m 0644 -- phone-openmoko.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/phone-openmoko.png
 
 uninstall:
+	$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/phone-n900.png
 	$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/phone-openmoko.png
 
 .PHONY: all clean distclean install uninstall
diff --git a/src/plugins/24x24/phone-n900.png b/src/plugins/24x24/phone-n900.png
new file mode 100644
index 0000000..d28df06
Binary files /dev/null and b/src/plugins/24x24/phone-n900.png differ
diff --git a/src/plugins/24x24/project.conf b/src/plugins/24x24/project.conf
index 87c7e4e..038befe 100644
--- a/src/plugins/24x24/project.conf
+++ b/src/plugins/24x24/project.conf
@@ -1,4 +1,7 @@
-dist=Makefile,phone-openmoko.png
+dist=Makefile,phone-n900.png,phone-openmoko.png
+
+[phone-n900.png]
+install=$(PREFIX)/share/icons/hicolor/24x24/apps
 
 [phone-openmoko.png]
 install=$(PREFIX)/share/icons/hicolor/24x24/apps
diff --git a/src/plugins/32x32/Makefile b/src/plugins/32x32/Makefile
index fa53749..477838a 100644
--- a/src/plugins/32x32/Makefile
+++ b/src/plugins/32x32/Makefile
@@ -12,10 +12,13 @@ clean:
 distclean: clean
 
 install:
+	$(MKDIR) $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps
+	$(INSTALL) -m 0644 -- phone-n900.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps/phone-n900.png
 	$(MKDIR) $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps
 	$(INSTALL) -m 0644 -- phone-openmoko.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps/phone-openmoko.png
 
 uninstall:
+	$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps/phone-n900.png
 	$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps/phone-openmoko.png
 
 .PHONY: all clean distclean install uninstall
diff --git a/src/plugins/32x32/phone-n900.png b/src/plugins/32x32/phone-n900.png
new file mode 100644
index 0000000..b2a8546
Binary files /dev/null and b/src/plugins/32x32/phone-n900.png differ
diff --git a/src/plugins/32x32/project.conf b/src/plugins/32x32/project.conf
index dd39c6c..260384b 100644
--- a/src/plugins/32x32/project.conf
+++ b/src/plugins/32x32/project.conf
@@ -1,4 +1,7 @@
-dist=Makefile,phone-openmoko.png
+dist=Makefile,phone-n900.png,phone-openmoko.png
+
+[phone-n900.png]
+install=$(PREFIX)/share/icons/hicolor/32x32/apps
 
 [phone-openmoko.png]
 install=$(PREFIX)/share/icons/hicolor/32x32/apps
diff --git a/src/plugins/48x48/Makefile b/src/plugins/48x48/Makefile
index 36309aa..74a1cf2 100644
--- a/src/plugins/48x48/Makefile
+++ b/src/plugins/48x48/Makefile
@@ -12,10 +12,13 @@ clean:
 distclean: clean
 
 install:
+	$(MKDIR) $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps
+	$(INSTALL) -m 0644 -- phone-n900.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/phone-n900.png
 	$(MKDIR) $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps
 	$(INSTALL) -m 0644 -- phone-openmoko.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/phone-openmoko.png
 
 uninstall:
+	$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/phone-n900.png
 	$(RM) -- $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/phone-openmoko.png
 
 .PHONY: all clean distclean install uninstall
diff --git a/src/plugins/48x48/phone-n900.png b/src/plugins/48x48/phone-n900.png
new file mode 100644
index 0000000..a2455ff
Binary files /dev/null and b/src/plugins/48x48/phone-n900.png differ
diff --git a/src/plugins/48x48/project.conf b/src/plugins/48x48/project.conf
index 512c3fd..b50271a 100644
--- a/src/plugins/48x48/project.conf
+++ b/src/plugins/48x48/project.conf
@@ -1,4 +1,7 @@
-dist=Makefile,phone-openmoko.png
+dist=Makefile,phone-n900.png,phone-openmoko.png
+
+[phone-n900.png]
+install=$(PREFIX)/share/icons/hicolor/48x48/apps
 
 [phone-openmoko.png]
 install=$(PREFIX)/share/icons/hicolor/48x48/apps
diff --git a/src/plugins/n900.c b/src/plugins/n900.c
index 947239e..85cea72 100644
--- a/src/plugins/n900.c
+++ b/src/plugins/n900.c
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 /* This code is inspired by existing work by Sebastian Reichel <sre@debian.org>,
  * see https://elektranox.org/n900/libisi */
+/* The N900 icon is adapted from an original work by Luc Andrea, CC BY-SA 3.0,
+ * see http://en.wikipedia.org/wiki/File:Nokia_N900_Maemo_icon.svg */
 /* TODO:
  * - test on actual hardware */
 
@@ -41,7 +43,7 @@ PhonePlugin plugin =
 {
 	NULL,
 	"Nokia N900",
-	NULL,
+	"phone-n900",
 	NULL,
 	NULL,
 	_n900_event,