diff --git a/Makefile b/Makefile
index 507706a9..5e0b659b 100644
--- a/Makefile
+++ b/Makefile
@@ -285,6 +285,9 @@ install : $(BIN)
 	$(CP) gfx2.gif $(DESTDIR)$(datadir)/grafx2/
 	$(CP) fonts/* $(DESTDIR)$(datadir)/grafx2/fonts/
 	$(CP) skins/base.gif $(DESTDIR)$(datadir)/grafx2/skins/
+	# Icon and desktop file for debian
+	$(CP) misc/grafx2.desktop $(DESTDIR)$(datadir)/applications/
+	$(CP) misc/grafx2.xpm $(DESTDIR)$(datadir)/icons/
 	@echo Install complete
   
 # Linux uninstallation of the program
@@ -297,6 +300,9 @@ uninstall :
 	$(if $(wildcard $(DESTDIR)$(datadir)/grafx2/fonts),,$(RMDIR) $(DESTDIR)$(datadir)/grafx2/fonts)
 	$(DELCOMMAND) $(DESTDIR)$(datadir)/grafx2/skins/base.gif
 	$(if $(wildcard $(DESTDIR)$(datadir)/grafx2/skins),,$(RMDIR) $(DESTDIR)$(datadir)/grafx2/skins)
+	# Icon and desktop file for debian
+	$(DELCOMMAND) $(DESTDIR)$(datadir)/applications/
+	$(DELCOMMAND) $(DESTDIR)$(datadir)/icons/
 	@echo Uninstall complete
 
 -include Makefile.dep
diff --git a/misc/grafx2.desktop b/misc/grafx2.desktop
new file mode 100644
index 00000000..b2982a33
--- /dev/null
+++ b/misc/grafx2.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=GrafX2
+Comment=Deluxe Paint Clone
+Exec=grafx2
+Terminal=false
+Type=Application
+Icon=grafx2.xpm
+Categories=Application;Graphics;
diff --git a/misc/grafx2.xpm b/misc/grafx2.xpm
new file mode 100644
index 00000000..20c9ff3f
--- /dev/null
+++ b/misc/grafx2.xpm
@@ -0,0 +1,54 @@
+/* XPM */
+static char *grafx_[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 16 1",
+"  c blue",
+". c #FEFFFF",
+"X c black",
+"o c #808080",
+"O c #008080",
+"+ c #800080",
+"@ c cyan",
+"# c #C0C0C0",
+"$ c navy",
+"% c None",
+"& c black",
+"* c black",
+"= c black",
+"- c black",
+"; c black",
+": c black",
+/* pixels */
+"XXXXXXXXXX%%%%%%%%%%%%XXXXXXXXXX",
+"X...@.@@@#X%%%%%%%%%%X..@@@@@# X",
+"X.@@#O#OOOOX%%%%%%%%X.OO      $X",
+"X.O@O#OO OOOX%%%%%%X@O o.o    $X",
+"X@@OOOOOO O OX%%%%X@O  o.o    $X",
+"X.O#OOOO O O OX%%X@O   o.o    $X",
+"X@OOO O O   O OXX@O oooo.oooo $X",
+"X@OO O O   O   O#O o......... $X",
+"X#O O O           o.oooo.oooo $X",
+"X OO O           o.o   o.o    $X",
+"%X$OO O O       o.o oo o.o   $X%",
+"%%X$OO           o.o.o o.o  $X%%",
+"%%%X$O         oo o.o      $X%%%",
+"%%%%X$O      o#.#o o.o    $X%%%%",
+"%%%%%X$      #o o.o o.   $X%%%%%",
+"%%%%%%X$    o. o.o.o#o  $X%%%%%%",
+"%%%%%%X#    o#o.o o.o   OX%%%%%%",
+"%%%%%X@      o.o         OX%%%%%",
+"%%%%X@O o.#o  o.o         OX%%%%",
+"%%%X@O o.oo#   o.          OX%%%",
+"%%X.O o.o o.ooo#o   o..o    OX%%",
+"%X.O o.o o.....o    .oo.     OX%",
+"X.O o.o o.o         .  .       X",
+"X. o.o   o.o        #  . o.   +X",
+"X@ .o o.o o.           .o.o  ++X",
+"X. .  .o.o    +XX      ..o    +X",
+"X@ #o   o. + +X%%X+ +  .o   + +X",
+"X@ o.o o.o+ +X%%%%X+          +X",
+"X@  o#..o+ +X%%%%%%X+ +   + + +X",
+"X#    + + +X%%%%%%%%X+ + + + ++X",
+"Xo++++++++X%%%%%%%%%%X+++++++++X",
+"XXXXXXXXXX%%%%%%%%%%%%XXXXXXXXXX"
+};