diff --git a/debian/control b/debian/control
index 6115387bb..55b2c6bdc 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: Yann Le Boulanger <asterix@lagaule.org>
 Build-Depends: debhelper (>= 4.0.0), cdbs, python-dev, libgtk2.0-dev, python-gtk2-dev, libgtkspell-dev, gettext, libxss-dev
-Standards-Version: 3.6.1
+Standards-Version: 3.6.2
 
 Package: gajim
 Architecture: any
diff --git a/debian/patches/00_debian-xpm.patch b/debian/patches/00_debian-xpm.patch
new file mode 100644
index 000000000..23e553acc
--- /dev/null
+++ b/debian/patches/00_debian-xpm.patch
@@ -0,0 +1,346 @@
+--- gajim-0.8.orig/data/pixmaps/gajim.xpm
++++ gajim-0.8/data/pixmaps/gajim.xpm
+@@ -0,0 +1,332 @@
++/* XPM */
++static char * gajim_xpm[] = {
++"32 32 297 2",
++"  	c None",
++". 	c #000000",
++"+ 	c #050503",
++"@ 	c #2A2514",
++"# 	c #40371C",
++"$ 	c #393017",
++"% 	c #161309",
++"& 	c #16140C",
++"* 	c #867746",
++"= 	c #D8BF6B",
++"- 	c #E8CB6D",
++"; 	c #E6C665",
++"> 	c #E6C25E",
++", 	c #E1BC56",
++"' 	c #B2933F",
++") 	c #4C3D18",
++"! 	c #010101",
++"~ 	c #443E25",
++"{ 	c #DCC676",
++"] 	c #ECD37C",
++"^ 	c #EACF74",
++"/ 	c #E8CB6C",
++"( 	c #E4BE56",
++"_ 	c #E2BA4F",
++": 	c #E0B647",
++"< 	c #9B7C2D",
++"[ 	c #0C0A03",
++"} 	c #484026",
++"| 	c #E9D27E",
++"1 	c #EED681",
++"2 	c #DEB140",
++"3 	c #A6832B",
++"4 	c #050401",
++"5 	c #0F0E08",
++"6 	c #DCC678",
++"7 	c #F1DE9A",
++"8 	c #EFD887",
++"9 	c #ECD37B",
++"0 	c #E8CA6C",
++"a 	c #E0B547",
++"b 	c #DCAD38",
++"c 	c #664F17",
++"d 	c #554D2E",
++"e 	c #F1DC96",
++"f 	c #F4E3AC",
++"g 	c #E6C664",
++"h 	c #E2BA4E",
++"i 	c #DEB13F",
++"j 	c #C0952C",
++"k 	c #020201",
++"l 	c #766A40",
++"m 	c #F2E1A2",
++"n 	c #F6E7B9",
++"o 	c #EACF73",
++"p 	c #E5C25D",
++"q 	c #DAA931",
++"r 	c #161104",
++"s 	c #665C37",
++"t 	c #F2DF9D",
++"u 	c #F7ECC6",
++"v 	c #EACE73",
++"w 	c #E4C25D",
++"x 	c #E2B94E",
++"y 	c #E0B546",
++"z 	c #DAA831",
++"A 	c #1D1606",
++"B 	c #292516",
++"C 	c #EED88A",
++"D 	c #F9F0D4",
++"E 	c #EFDA8A",
++"F 	c #E3BE56",
++"G 	c #CFA02E",
++"H 	c #070502",
++"I 	c #AB9A5C",
++"J 	c #F6EAC2",
++"K 	c #F2E1A4",
++"L 	c #ECD37A",
++"M 	c #E8CA6B",
++"N 	c #E3BE55",
++"O 	c #DCAC38",
++"P 	c #886A1F",
++"Q 	c #1F1C10",
++"R 	c #DCC87F",
++"S 	c #F5E9BD",
++"T 	c #E2BD55",
++"U 	c #E1B94E",
++"V 	c #DEB03E",
++"W 	c #C69C32",
++"X 	c #171205",
++"Y 	c #2C0000",
++"Z 	c #0E0000",
++"` 	c #36311D",
++" .	c #E6D186",
++"..	c #EFD98F",
++"+.	c #EACE72",
++"@.	c #E6C663",
++"#.	c #E1B94D",
++"$.	c #D4A93C",
++"%.	c #2E240C",
++"&.	c #100000",
++"*.	c #2D0000",
++"=.	c #301A1E",
++"-.	c #334751",
++";.	c #0B1315",
++">.	c #5D5432",
++",.	c #EDD47F",
++"'.	c #E4C25C",
++").	c #E0B94D",
++"!.	c #DFB546",
++"~.	c #564519",
++"{.	c #0B1411",
++"].	c #3C5E51",
++"^.	c #342520",
++"/.	c #2D0101",
++"(.	c #2D0506",
++"_.	c #333944",
++":.	c #365B6A",
++"<.	c #375D6A",
++"[.	c #305159",
++"}.	c #040504",
++"|.	c #BDA861",
++"1.	c #E6C563",
++"2.	c #E4C15C",
++"3.	c #B29038",
++"4.	c #030403",
++"5.	c #376055",
++"6.	c #437667",
++"7.	c #447866",
++"8.	c #3E5647",
++"9.	c #2F0B0A",
++"0.	c #2E090B",
++"a.	c #344858",
++"b.	c #36596A",
++"c.	c #385F69",
++"d.	c #142224",
++"e.	c #645933",
++"f.	c #E8CA6A",
++"g.	c #E2BD54",
++"h.	c #5E4C1E",
++"i.	c #142320",
++"j.	c #427467",
++"k.	c #457A66",
++"l.	c #436E5B",
++"m.	c #31130F",
++"n.	c #334759",
++"o.	c #35576A",
++"p.	c #22393E",
++"q.	c #342E1B",
++"r.	c #302710",
++"s.	c #25403A",
++"t.	c #457C66",
++"u.	c #44725C",
++"v.	c #300E0B",
++"w.	c #313645",
++"x.	c #34556B",
++"y.	c #396069",
++"z.	c #2A474D",
++"A.	c #16140B",
++"B.	c #E8CC71",
++"C.	c #E8C96A",
++"D.	c #E6C562",
++"E.	c #DEB74C",
++"F.	c #141006",
++"G.	c #2E5148",
++"H.	c #467E66",
++"I.	c #41604C",
++"J.	c #2D0302",
++"K.	c #2E141A",
++"L.	c #33536B",
++"M.	c #3B606D",
++"N.	c #466A73",
++"O.	c #365C64",
++"P.	c #101313",
++"Q.	c #544C31",
++"R.	c #51492F",
++"S.	c #463E28",
++"T.	c #484027",
++"U.	c #564A2B",
++"V.	c #524728",
++"W.	c #090D0C",
++"X.	c #3E6C61",
++"Y.	c #477F65",
++"Z.	c #362C23",
++"`.	c #31394B",
++" +	c #5A7884",
++".+	c #466973",
++"++	c #334346",
++"@+	c #161616",
++"#+	c #191919",
++"$+	c #1C1C1C",
++"%+	c #1A1A1A",
++"&+	c #171717",
++"*+	c #395952",
++"=+	c #417267",
++"-+	c #446D55",
++";+	c #2D0201",
++">+	c #324F68",
++",+	c #416472",
++"'+	c #78919A",
++")+	c #3E646D",
++"!+	c #354547",
++"~+	c #212121",
++"{+	c #1B1B1B",
++"]+	c #181818",
++"^+	c #1D1D1D",
++"/+	c #262626",
++"(+	c #3F635C",
++"_+	c #488165",
++":+	c #321611",
++"<+	c #2D090D",
++"[+	c #302E3C",
++"}+	c #312F3B",
++"|+	c #31303A",
++"1+	c #365767",
++"2+	c #6A8490",
++"3+	c #79919B",
++"4+	c #39606A",
++"5+	c #354C50",
++"6+	c #1A2020",
++"7+	c #050606",
++"8+	c #101212",
++"9+	c #232C2A",
++"0+	c #3F675F",
++"a+	c #457965",
++"b+	c #393C31",
++"c+	c #38392E",
++"d+	c #39392D",
++"e+	c #39392C",
++"f+	c #311510",
++"g+	c #2E090A",
++"h+	c #365969",
++"i+	c #8EA2AB",
++"j+	c #758E97",
++"k+	c #3A6269",
++"l+	c #3B6469",
++"m+	c #3B6567",
++"n+	c #38605F",
++"o+	c #3B6664",
++"p+	c #3E6C67",
++"q+	c #3F6E68",
++"r+	c #407067",
++"s+	c #30120F",
++"t+	c #2F1B21",
++"u+	c #466676",
++"v+	c #A0B0B9",
++"w+	c #718B95",
++"x+	c #3C6668",
++"y+	c #3D6868",
++"z+	c #3D6A68",
++"A+	c #3E6C68",
++"B+	c #352B23",
++"C+	c #312E37",
++"D+	c #647F8C",
++"E+	c #A1B1B9",
++"F+	c #6F8A94",
++"G+	c #3B4639",
++"H+	c #333E4A",
++"I+	c #7D949F",
++"J+	c #708A94",
++"K+	c #40614F",
++"L+	c #344C5C",
++"M+	c #92A5AF",
++"N+	c #738C96",
++"O+	c #457963",
++"P+	c #2D0202",
++"Q+	c #2D0102",
++"R+	c #355567",
++"S+	c #A7B6BE",
++"T+	c #78909A",
++"U+	c #2F0B09",
++"V+	c #2D080A",
++"W+	c #B0BDC5",
++"X+	c #9AABB4",
++"Y+	c #778F99",
++"Z+	c #3D626C",
++"`+	c #311511",
++" @	c #2E090C",
++".@	c #33404D",
++"+@	c #33414D",
++"@@	c #34434D",
++"#@	c #35444D",
++"$@	c #35444B",
++"%@	c #36454B",
++"&@	c #36464B",
++"*@	c #37474A",
++"=@	c #384849",
++"-@	c #384949",
++";@	c #384A48",
++">@	c #394B48",
++",@	c #3A4C47",
++"'@	c #3A4D46",
++")@	c #3B4E46",
++"!@	c #3C4F45",
++"~@	c #3C5044",
++"{@	c #3D5143",
++"]@	c #3D5142",
++"^@	c #311310",
++"                                                                ",
++"                        . + @ # $ % . .                         ",
++"                    . & * = - ; > , ' ) !                       ",
++"                  . ~ { ] ^ / ; > ( _ : < [                     ",
++"                . } | 1 ] ^ / ; > ( _ : 2 3 4                   ",
++"                5 6 7 8 9 ^ 0 ; > ( _ a 2 b c .                 ",
++"              . d e f 8 9 ^ 0 g > ( h a i b j k                 ",
++"              . l m n 1 9 o 0 g p ( h a i b q r                 ",
++"              . s t u 1 9 v 0 g w ( x y i b z A                 ",
++"                B C D E 9 v 0 g w F x y i b G H                 ",
++"                . I J K L v M g w N x y i O P .                 ",
++"                  Q R S 9 v M g w T U y V W X                   ",
++"                Y Z `  ...+.M @.w T #.y $.%.&.*.                ",
++"              *.=.-.;.>.,.+.M @.'.T ).!.~.{.].^./.*.            ",
++"          *.(._.:.<.[.}.|.+.M 1.2.T ).3.4.5.6.7.8.9.*.          ",
++"        *.0.a.b.:.<.c.d.e.+.f.1.2.g.).h.i.j.6.7.k.l.m.*.        ",
++"        (.n.o.b.:.<.c.p.q.+.f.1.2.g.).r.s.j.6.7.k.t.u.v.*.      ",
++"      *.w.x.o.b.:.<.y.z.A.B.C.D.2.g.E.F.G.j.6.7.k.t.H.I.J.      ",
++"    *.K.L.x.o.b.:.M.N.O.P.Q.R.S.T.U.V.W.X.j.6.7.k.t.H.Y.Z.*.    ",
++"    *.`.L.x.o.b.:. +.+y.++@+#+$+%+&+$+*+=+j.6.7.k.t.H.Y.-+;+    ",
++"    (.>+L.x.o.b.,+'+)+y.!+~+{+]+#+^+/+(+=+j.6.7.k.t.H.Y._+:+*.  ",
++"  *.<+[+[+}+|+1+2+3+4+y.5+6+7+. ! 8+9+0+=+j.6.7.a+b+c+d+e+f+*.  ",
++"  *.*.*.*.*.g+h+i+j+c.y.k+l+m+n+o+p+q+r+=+j.6.7.k.s+*.*.*.*.*.  ",
++"          *.t+u+v+w+c.y.k+l+x+y+z+A+q+r+=+j.6.7.k.B+*.          ",
++"          *.C+D+E+F+c.y.k+l+x+y+z+A+q+r+=+j.6.7.k.G+*.          ",
++"          *.H+I+E+J+c.y.k+l+x+y+z+A+q+r+=+j.6.7.k.K+*.          ",
++"          *.L+M+E+N+c.y.k+l+x+y+z+A+q+r+=+j.6.7.k.O+P+          ",
++"          Q+R+S+E+T+c.y.k+l+x+y+z+A+q+r+=+j.6.7.k.t.U+          ",
++"          V+o.W+X+Y+Z+y.k+l+x+y+z+A+q+r+=+j.6.7.k.t.`+          ",
++"           @.@+@@@#@$@%@&@*@=@-@;@>@,@'@)@)@!@~@{@]@^@*.        ",
++"          *.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.*.        ",
++"                                                                "};
+--- gajim-0.8.orig/Makefile
++++ gajim-0.8/Makefile
+@@ -69,7 +69,7 @@
+ 	done
+ 	cp COPYING "$(DESTDIR)$(PREFIX)/share/gajim/";
+ 	mkdir -p "$(DESTDIR)$(PREFIX)/share/pixmaps";
+-	cp data/pixmaps/gajim.png "$(DESTDIR)$(PREFIX)/share/pixmaps/";
++	cp data/pixmaps/gajim.xpm "$(DESTDIR)$(PREFIX)/share/pixmaps/";
+ 	cp data/pixmaps/gajim_about.png "$(DESTDIR)$(PREFIX)/share/pixmaps/";
+ 	mkdir -p "$(DESTDIR)$(PREFIX)/share/applications";
+ 	cp gajim.desktop "$(DESTDIR)$(PREFIX)/share/applications/";