diff --git a/icons/tbftss-128x128.png b/icons/tbftss-128x128.png
new file mode 100644
index 0000000..117658a
Binary files /dev/null and b/icons/tbftss-128x128.png differ
diff --git a/icons/tbftss-16x16.png b/icons/tbftss-16x16.png
new file mode 100644
index 0000000..a7661c1
Binary files /dev/null and b/icons/tbftss-16x16.png differ
diff --git a/icons/tbftss-256x256.png b/icons/tbftss-256x256.png
new file mode 100644
index 0000000..70eaa28
Binary files /dev/null and b/icons/tbftss-256x256.png differ
diff --git a/icons/tbftss-32x32.png b/icons/tbftss-32x32.png
new file mode 100644
index 0000000..762a08a
Binary files /dev/null and b/icons/tbftss-32x32.png differ
diff --git a/icons/tbftss-64x64.png b/icons/tbftss-64x64.png
new file mode 100644
index 0000000..6b5296a
Binary files /dev/null and b/icons/tbftss-64x64.png differ
diff --git a/icons/tbftss.desktop b/icons/tbftss.desktop
new file mode 100644
index 0000000..ee67853
--- /dev/null
+++ b/icons/tbftss.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Categories=Game;ActionGame;
+Name=TBFTSS : The Pandoran War
+Comment=Mission and Objective based 2D Space Shooter
+Icon=tbftss
+Exec=tbftss
+Terminal=false
+Type=Application
diff --git a/makefile b/makefile
index afd1d2e..e1453c8 100644
--- a/makefile
+++ b/makefile
@@ -3,6 +3,8 @@ CC = gcc
 BIN_DIR = /usr/bin
 DATA_DIR = /opt/tbftss
 LOCALE_DIR = /usr/share/locale
+ICON_DIR = /usr/share/icons/hicolor
+DESKTOP_DIR = /usr/share/applications
 
 SEARCHPATH += src/plat/unix
 OBJS += unixInit.o
@@ -29,6 +31,11 @@ install:
 	cp -r manual $(DATA_DIR)
 	cp -r music $(DATA_DIR)
 	cp -r sound $(DATA_DIR)
+	cp -p icons/$(PROG)-16x16.png $(ICON_DIR)/16x16/apps/$(PROG).png
+	cp -p icons/$(PROG)-32x32.png $(ICON_DIR)/32x32/apps/$(PROG).png
+	cp -p icons/$(PROG)-64x64.png $(ICON_DIR)/64x64/apps/$(PROG).png
+	cp -p icons/$(PROG)-128x128.png $(ICON_DIR)/128x128/apps/$(PROG).png
+	cp -p icons/$(PROG).desktop $(DESKTOP_DIR)
 	
 	@for f in $(LOCALE_MO); do \
 		lang=`echo $$f | sed -e 's/^locale\///;s/\.mo$$//'`; \
@@ -39,6 +46,11 @@ install:
 uninstall:
 	$(RM) $(BIN_DIR)/$(PROG)
 	$(RM) -rf $(DATA_DIR)
+	$(RM) $(ICON_DIR)/16x16/apps/$(PROG).png
+	$(RM) $(ICON_DIR)/32x32/apps/$(PROG).png
+	$(RM) $(ICON_DIR)/64x64/apps/$(PROG).png
+	$(RM) $(ICON_DIR)/128x128/apps/$(PROG).png
+	$(RM) $(DESKTOP_DIR)/$(PROG).desktop
 	
 	@for f in $(LOCALE_MO); do \
 		lang=`echo $$f | sed -e 's/^locale\///;s/\.mo$$//'`; \