diff --git a/packaging/linux/hicolor/128x128/apps/openra.png b/packaging/linux/hicolor/128x128/apps/openra.png
new file mode 100644
index 0000000000..2b2cefb966
Binary files /dev/null and b/packaging/linux/hicolor/128x128/apps/openra.png differ
diff --git a/packaging/linux/hicolor/16x16/apps/openra.png b/packaging/linux/hicolor/16x16/apps/openra.png
new file mode 100644
index 0000000000..d496cb30a8
Binary files /dev/null and b/packaging/linux/hicolor/16x16/apps/openra.png differ
diff --git a/packaging/linux/hicolor/32x32/apps/openra.png b/packaging/linux/hicolor/32x32/apps/openra.png
new file mode 100644
index 0000000000..8dbf5f1d3a
Binary files /dev/null and b/packaging/linux/hicolor/32x32/apps/openra.png differ
diff --git a/packaging/linux/hicolor/48x48/apps/openra.png b/packaging/linux/hicolor/48x48/apps/openra.png
new file mode 100644
index 0000000000..347b4e8ca1
Binary files /dev/null and b/packaging/linux/hicolor/48x48/apps/openra.png differ
diff --git a/packaging/linux/hicolor/64x64/apps/openra.png b/packaging/linux/hicolor/64x64/apps/openra.png
new file mode 100644
index 0000000000..1c31b0307f
Binary files /dev/null and b/packaging/linux/hicolor/64x64/apps/openra.png differ
diff --git a/packaging/linux/openra-cnc b/packaging/linux/openra-cnc
new file mode 100644
index 0000000000..be05d12ad4
--- /dev/null
+++ b/packaging/linux/openra-cnc
@@ -0,0 +1,2 @@
+?package(openra):needs="X11" section="Games/Simulation" title="OpenRA - Command & Conquer"\
+command="/usr/bin/openra Game.Mods=cnc" icon="/usr/share/pixmaps/openra.32.xpm"
diff --git a/packaging/linux/openra-cnc.desktop b/packaging/linux/openra-cnc.desktop
new file mode 100644
index 0000000000..143e44b0a8
--- /dev/null
+++ b/packaging/linux/openra-cnc.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Version=20100907-1
+Name=OpenRA - Command & Conquer
+Comment=The OpenRA RTS engine running Command & Conquer
+Icon=openra
+Exec=/usr/bin/openra Game.Mods=cnc
+Terminal=false
+Categories=Game;
diff --git a/packaging/linux/openra-ra b/packaging/linux/openra-ra
new file mode 100644
index 0000000000..26aceb86b1
--- /dev/null
+++ b/packaging/linux/openra-ra
@@ -0,0 +1,2 @@
+?package(openra):needs="X11" section="Games/Simulation" title="OpenRA - Red Alert"\
+command="/usr/bin/openra Game.Mods=ra" icon="/usr/share/pixmaps/openra.32.xpm"
diff --git a/packaging/linux/openra-ra.desktop b/packaging/linux/openra-ra.desktop
new file mode 100644
index 0000000000..0d293cf639
--- /dev/null
+++ b/packaging/linux/openra-ra.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Version=20100907-1
+Name=OpenRA - Red Alert
+Comment=The OpenRA RTS engine running Red Alert
+Icon=openra
+Exec=/usr/bin/openra Game.Mods=ra
+Terminal=false
+Categories=Game;
diff --git a/packaging/linux/openra.32.xpm b/packaging/linux/openra.32.xpm
new file mode 100644
index 0000000000..d09bc13740
--- /dev/null
+++ b/packaging/linux/openra.32.xpm
@@ -0,0 +1,358 @@
+/* XPM */
+static char * openra_32_xpm[] = {
+"32 32 323 2",
+"  	c None",
+". 	c #0B0A0B",
+"+ 	c #090909",
+"@ 	c #0B0A0A",
+"# 	c #080A0A",
+"$ 	c #00080A",
+"% 	c #4F1109",
+"& 	c #0D0C0C",
+"* 	c #350F0B",
+"= 	c #C11F0A",
+"- 	c #020809",
+"; 	c #040809",
+"> 	c #A51C0A",
+", 	c #FF280B",
+"' 	c #050507",
+") 	c #0B0A09",
+"! 	c #5B4A14",
+"~ 	c #710805",
+"{ 	c #611207",
+"] 	c #080808",
+"^ 	c #44120C",
+"/ 	c #401E0B",
+"( 	c #D4D12B",
+"_ 	c #4D4C13",
+": 	c #000005",
+"< 	c #04090A",
+"[ 	c #AE1A08",
+"} 	c #FF2509",
+"| 	c #390D08",
+"1 	c #EFDF2C",
+"2 	c #C1B226",
+"3 	c #0D0B06",
+"4 	c #070708",
+"5 	c #FF2708",
+"6 	c #FD2307",
+"7 	c #F92309",
+"8 	c #3D0E08",
+"9 	c #ECD22A",
+"0 	c #F6D72A",
+"a 	c #25220B",
+"b 	c #000105",
+"c 	c #3A3912",
+"d 	c #535F17",
+"e 	c #61691A",
+"f 	c #686A17",
+"g 	c #7E1608",
+"h 	c #321D09",
+"i 	c #FFD92B",
+"j 	c #FCD129",
+"k 	c #18170A",
+"l 	c #080D0D",
+"m 	c #00090A",
+"n 	c #000909",
+"o 	c #000709",
+"p 	c #000608",
+"q 	c #030408",
+"r 	c #6B6418",
+"s 	c #FFEE2F",
+"t 	c #FFE02E",
+"u 	c #FFDB2C",
+"v 	c #BBB024",
+"w 	c #711006",
+"x 	c #E41E09",
+"y 	c #5F5914",
+"z 	c #FFC527",
+"A 	c #D3A821",
+"B 	c #000405",
+"C 	c #000606",
+"D 	c #000505",
+"E 	c #030606",
+"F 	c #010404",
+"G 	c #020404",
+"H 	c #040404",
+"I 	c #030303",
+"J 	c #070707",
+"K 	c #1E0C0B",
+"L 	c #BC1F09",
+"M 	c #C61D09",
+"N 	c #C51D07",
+"O 	c #CD1F09",
+"P 	c #D5210A",
+"Q 	c #E22108",
+"R 	c #7C0C06",
+"S 	c #7F7A1C",
+"T 	c #FFEA30",
+"U 	c #FCDA2B",
+"V 	c #FEDB2E",
+"W 	c #B0A321",
+"X 	c #670806",
+"Y 	c #FF1F07",
+"Z 	c #FF1F09",
+"` 	c #670504",
+" .	c #E3B725",
+"..	c #FFC027",
+"+.	c #443B0F",
+"@.	c #B61707",
+"#.	c #9D1206",
+"$.	c #8E1106",
+"%.	c #800D04",
+"&.	c #730D05",
+"*.	c #390A06",
+"=.	c #020303",
+"-.	c #090808",
+";.	c #0E0809",
+">.	c #D01F09",
+",.	c #FE2107",
+"'.	c #FC2209",
+").	c #FF2309",
+"!.	c #811209",
+"~.	c #8F8D1E",
+"{.	c #FFE32E",
+"].	c #FBD82B",
+"^.	c #FCD52A",
+"/.	c #FDD22A",
+"(.	c #D3BB26",
+"_.	c #470805",
+":.	c #FA1D06",
+"<.	c #F01C07",
+"[.	c #615A15",
+"}.	c #FDB323",
+"|.	c #B68A1C",
+"1.	c #910F06",
+"2.	c #C91705",
+"3.	c #BB1303",
+"4.	c #BF1807",
+"5.	c #4C0B06",
+"6.	c #000102",
+"7.	c #000607",
+"8.	c #911709",
+"9.	c #FF2409",
+"0.	c #501509",
+"a.	c #EAD52D",
+"b.	c #FBD22A",
+"c.	c #FED62C",
+"d.	c #DEC026",
+"e.	c #FFD42A",
+"f.	c #FDC92A",
+"g.	c #D1B725",
+"h.	c #3F0605",
+"i.	c #FF1F08",
+"j.	c #FE1E08",
+"k.	c #49220A",
+"l.	c #FFBB24",
+"m.	c #FBB523",
+"n.	c #4C0403",
+"o.	c #C41504",
+"p.	c #BC1606",
+"q.	c #1D0504",
+"r.	c #4D0E08",
+"s.	c #FF2208",
+"t.	c #FF2007",
+"u.	c #350F07",
+"v.	c #F0D42B",
+"w.	c #B09E21",
+"x.	c #300004",
+"y.	c #8E841C",
+"z.	c #FFC627",
+"A.	c #FCBE26",
+"B.	c #CEAC23",
+"C.	c #430403",
+"D.	c #FF1C05",
+"E.	c #481809",
+"F.	c #FDBB24",
+"G.	c #F6B023",
+"H.	c #451B08",
+"I.	c #AC1305",
+"J.	c #010304",
+"K.	c #070606",
+"L.	c #070808",
+"M.	c #1A0908",
+"N.	c #E61E08",
+"O.	c #FF220A",
+"P.	c #431A0B",
+"Q.	c #740A05",
+"R.	c #750804",
+"S.	c #AD921E",
+"T.	c #FFBD27",
+"U.	c #FCB423",
+"V.	c #C49E1F",
+"W.	c #610704",
+"X.	c #50380E",
+"Y.	c #EEA822",
+"Z.	c #E9A420",
+"`.	c #2F2008",
+" +	c #090807",
+".+	c #BF1907",
+"++	c #AB1104",
+"@+	c #F51E08",
+"#+	c #F31B06",
+"$+	c #FC1D07",
+"%+	c #5D0706",
+"&+	c #BF9A1E",
+"*+	c #F9B024",
+"=+	c #F4AB22",
+"-+	c #AF851A",
+";+	c #B5831B",
+">+	c #DB9B1E",
+",+	c #E7A31D",
+"'+	c #151007",
+")+	c #000004",
+"!+	c #545112",
+"~+	c #AF901E",
+"{+	c #331107",
+"]+	c #F41E07",
+"^+	c #E71A07",
+"/+	c #F11A05",
+"(+	c #440605",
+"_+	c #CD9E20",
+":+	c #E9A421",
+"<+	c #E7A422",
+"[+	c #E09F20",
+"}+	c #D6981F",
+"|+	c #C58C1C",
+"1+	c #000000",
+"2+	c #5F4B10",
+"3+	c #FFBD25",
+"4+	c #F9AF23",
+"5+	c #ECB324",
+"6+	c #2E1A09",
+"7+	c #BC1708",
+"8+	c #E91A05",
+"9+	c #D21A08",
+"0+	c #080001",
+"a+	c #D89B1F",
+"b+	c #D99A1D",
+"c+	c #D3961E",
+"d+	c #D1931D",
+"e+	c #4A340C",
+"f+	c #110D06",
+"g+	c #C7961F",
+"h+	c #F3AC21",
+"i+	c #C9941F",
+"j+	c #CA971F",
+"k+	c #E9A31F",
+"l+	c #F6B123",
+"m+	c #886715",
+"n+	c #54460F",
+"o+	c #795E14",
+"p+	c #CF941D",
+"q+	c #DD9E1F",
+"r+	c #D1951E",
+"s+	c #C98E1C",
+"t+	c #C68C1B",
+"u+	c #45320C",
+"v+	c #000001",
+"w+	c #CB911C",
+"x+	c #DE9E21",
+"y+	c #E9A922",
+"z+	c #361006",
+"A+	c #440603",
+"B+	c #C6941E",
+"C+	c #DE9D1F",
+"D+	c #D9991E",
+"E+	c #D5971F",
+"F+	c #D29620",
+"G+	c #CB8F1C",
+"H+	c #C38A1B",
+"I+	c #C68D1C",
+"J+	c #B6811A",
+"K+	c #B47F18",
+"L+	c #020204",
+"M+	c #000002",
+"N+	c #DA9B1E",
+"O+	c #D6981D",
+"P+	c #301B07",
+"Q+	c #C31605",
+"R+	c #CF1907",
+"S+	c #4C0503",
+"T+	c #725813",
+"U+	c #D7991F",
+"V+	c #DC9C1E",
+"W+	c #D1941E",
+"X+	c #D3961C",
+"Y+	c #C38B1C",
+"Z+	c #684E10",
+"`+	c #45310B",
+" @	c #A77616",
+".@	c #0C0605",
+"+@	c #080602",
+"@@	c #000205",
+"#@	c #760F06",
+"$@	c #AE1304",
+"%@	c #B31505",
+"&@	c #C11404",
+"*@	c #640B05",
+"=@	c #000003",
+"-@	c #1E1606",
+";@	c #342509",
+">@	c #181206",
+",@	c #060002",
+"'@	c #9A1005",
+")@	c #7E0D04",
+"!@	c #3D0705",
+"~@	c #880E04",
+"{@	c #000304",
+"]@	c #000203",
+"^@	c #9D1205",
+"/@	c #9D1003",
+"(@	c #A71204",
+"_@	c #330805",
+":@	c #170403",
+"<@	c #870F04",
+"[@	c #860E04",
+"}@	c #880E02",
+"|@	c #080404",
+"1@	c #190706",
+"2@	c #9A1003",
+"3@	c #700D05",
+"4@	c #030405",
+"5@	c #000202",
+"6@	c #4F0903",
+"7@	c #790D03",
+"8@	c #2F0602",
+"9@	c #040303",
+"0@	c #020202",
+"a@	c #410602",
+"b@	c #2B0503",
+"c@	c #000303",
+"d@	c #1B0605",
+"e@	c #4B0803",
+"f@	c #030202",
+"g@	c #040304",
+"h@	c #010101",
+"                                                                ",
+"                                .                               ",
+"                                +                               ",
+"                              @ #                               ",
+"                              $ % &                             ",
+"                              * = -                             ",
+"                            ; > , '                             ",
+"                            ) ! ~ { ]                           ",
+"                            ^ / ( _ :                           ",
+"                          < [ } | 1 2 3                         ",
+"                          4 5 6 7 8 9 0 a                       ",
+"                        b c d e f g h i j k                     ",
+"  + + l m n $ o p p o q r s t u v w x y z A : B C D E F G H I   ",
+"    J K L M N O P Q R S T U V W X Y Z `  ...+.@.#.$.%.&.*.=.H   ",
+"      -.;.>.,.'.).!.~.{.].^./.(._.Y :.<.[.}.|.1.2.3.4.5.6.      ",
+"          7.8.9.).0.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.G         ",
+"            C r.s.t.u.v.w.x.y.z.A.B.C.D.E.F.G.H.I.J.K.          ",
+"              L.M.N.O.P.Q.t.R.S.T.U.V.W.X.Y.Z.`.D               ",
+"                 +7..+++@+#+$+%+&+*+=+-+;+>+,+'+                ",
+"                  )+!+~+{+]+^+/+(+_+:+<+[+}+|+1+                ",
+"                )+2+3+4+5+6+7+8+9+0+a+b+c+d+e+                  ",
+"              f+g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+                  ",
+"            v+w+x+y+z+A+B+C+>+D+E+F+G+H+I+J+K+L+                ",
+"            M+N+O+P+Q+R+S+T+U+V+W+X+Y+Z+`+ @.@I                 ",
+"              +@@@#@$@%@&@*@=@-@;@>@,@'@)@!@~@{@                ",
+"                ]@^@/@(@_@D         G :@<@[@}@|@                ",
+"                1@2@3@4@H             H 5@6@7@8@9@              ",
+"              0@a@b@]@                    c@d@e@]@              ",
+"              I F I                         f@g@I               ",
+"              0@                                h@              ",
+"                                                  0@            ",
+"                                                                "};
diff --git a/packaging/package-all.sh b/packaging/package-all.sh
index 5e9130c826..4bbb26546e 100755
--- a/packaging/package-all.sh
+++ b/packaging/package-all.sh
@@ -57,6 +57,32 @@ fi
 
 pushd packaging &> /dev/null
 
+####### *nix Builds #######
+pushd linux &> /dev/null
+
+#Desktop Icons
+BUILTDIR=../../../built
+mkdir -p $BUILTDIR/usr/share/applications/
+sed -i "3,3 d" openra-ra.desktop
+sed -i "3,3 i\Version=$VERSION" openra-ra.desktop
+sed -i "3,3 d" openra-cnc.desktop
+sed -i "3,3 i\Version=$VERSION" openra-cnc.desktop
+cp openra-ra.desktop $BUILTDIR/usr/share/applications/
+cp openra-cnc.desktop $BUILTDIR/usr/share/applications/
+
+#Menu entries
+mkdir -p $BUILTDIR/usr/share/menu/
+cp openra-ra $BUILTDIR/usr/share/menu/
+cp openra-cnc $BUILTDIR/usr/share/menu/
+
+#Icon images
+mkdir -p $BUILTDIR/usr/share/pixmaps/
+cp openra.32.xpm $BUILTDIR/usr/share/pixmaps/
+mkdir -p $BUILTDIR/usr/share/icons/
+cp -r hicolor $BUILTDIR/usr/share/icons/
+
+popd &> /dev/null
+
 #Arch-Linux
 msg "\E[34m" "Building Arch-Linux package."
 pushd linux/pkgbuild/ &> /dev/null
@@ -84,7 +110,7 @@ if [ $? -ne 0 ]; then
 fi
 popd &> /dev/null
 
-#OSX
+####### OSX #######
 msg "\E[34m" "Building OSX package."
 pushd osx/ &>/dev/null
 sh package-game.sh ~/openra-package/$_gitname-build "$VERSION" &> package.log
@@ -95,7 +121,7 @@ else
 fi
 popd &> /dev/null
 
-#Windows
+####### Windows #######
 msg "\E[34m" "Building Windows package."
 pushd windows/ &> /dev/null
 makensis -DSRCDIR=/home/openra/openra-package/$_gitname-build OpenRA.nsi &> package.log