diff --git a/packaging/linux/buildpackage.sh b/packaging/linux/buildpackage.sh
index 16c1c1b7ef..951bbab23c 100644
--- a/packaging/linux/buildpackage.sh
+++ b/packaging/linux/buildpackage.sh
@@ -18,15 +18,17 @@ rm -rf $ROOTDIR
 # Game files
 mkdir -p $ROOTDIR/usr/bin/
 cp -T openra-bin $ROOTDIR/usr/bin/openra
+cp -T openra-editor-bin $ROOTDIR/usr/bin/openra-editor
 mkdir -p $ROOTDIR/usr/share/openra/
 cp -R $BUILTDIR/* "$ROOTDIR/usr/share/openra/" || exit 3
 
 # Desura launch scripts
 cp ../../*.sh "$ROOTDIR/usr/share/openra/" || exit 3
+cp desura* "$ROOTDIR/usr/share/openra/" || exit 3
 
 # Desktop Icons
 mkdir -p $ROOTDIR/usr/share/applications/
-cp openra.desktop "$ROOTDIR/usr/share/applications/"
+cp *.desktop "$ROOTDIR/usr/share/applications/"
 
 mkdir -p $ROOTDIR/usr/share/icons/
 cp -r hicolor $ROOTDIR/usr/share/icons/
diff --git a/desura_launch_Editor.sh b/packaging/linux/desura_launch_Editor.sh
similarity index 100%
rename from desura_launch_Editor.sh
rename to packaging/linux/desura_launch_Editor.sh
diff --git a/desura_launch_Play.sh b/packaging/linux/desura_launch_Play.sh
similarity index 100%
rename from desura_launch_Play.sh
rename to packaging/linux/desura_launch_Play.sh
diff --git a/packaging/linux/hicolor/32x32/apps/openra-editor.png b/packaging/linux/hicolor/32x32/apps/openra-editor.png
new file mode 100644
index 0000000000..3b2fa799a8
Binary files /dev/null and b/packaging/linux/hicolor/32x32/apps/openra-editor.png differ
diff --git a/packaging/linux/hicolor/48x48/apps/openra-editor.png b/packaging/linux/hicolor/48x48/apps/openra-editor.png
new file mode 100644
index 0000000000..44796bbbe9
Binary files /dev/null and b/packaging/linux/hicolor/48x48/apps/openra-editor.png differ
diff --git a/packaging/linux/openra-editor-bin b/packaging/linux/openra-editor-bin
new file mode 100755
index 0000000000..cfc55f05f8
--- /dev/null
+++ b/packaging/linux/openra-editor-bin
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /usr/share/openra
+mono OpenRA.Editor.exe "$@"
diff --git a/packaging/linux/openra-editor.desktop b/packaging/linux/openra-editor.desktop
new file mode 100644
index 0000000000..f1a378a0b8
--- /dev/null
+++ b/packaging/linux/openra-editor.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=OpenRA Map Editor
+GenericName=Tile based RTS game map editor
+Comment=Import legacy maps and create new ones from scratch
+Icon=openra-editor
+Exec=openra-editor
+Terminal=false
+Categories=Game;StrategyGame;
\ No newline at end of file