diff --git a/MANIFEST.in b/MANIFEST.in
index 0e94db321..73ff3c545 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,6 +6,7 @@ recursive-include resources/forms *
 recursive-include resources/i18n *
 recursive-include resources/images *
 recursive-include scripts *.py
+include resources/*.desktop
 include copyright.txt
 include LICENSE
-include version.txt
+include openlp/.version
diff --git a/resources/openlp.desktop b/resources/openlp.desktop
new file mode 100644
index 000000000..8791c2d8f
--- /dev/null
+++ b/resources/openlp.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=OpenLP
+GenericName=Church lyrics projection
+Exec=openlp
+Icon=openlp
+StartupNotify=true
+Terminal=False
+Type=Application
+Categories=AudioVideo
diff --git a/setup.py b/setup.py
old mode 100644
new mode 100755
index 29db13c4b..73cecd97a
--- a/setup.py
+++ b/setup.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
 from setuptools import setup, find_packages
 import sys, os
 
@@ -25,7 +27,7 @@ try:
     finally:
         b.unlock()
 except:
-    ver_file = open(VERSION_FILE, u'w')
+    ver_file = open(VERSION_FILE, u'r')
     version = ver_file.read().strip()
     ver_file.close()
 
@@ -43,6 +45,7 @@ OpenLP (previously openlp.org) is free church presentation software, or lyrics p
     url='http://openlp.org/',
     license='GNU General Public License',
     packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
+    scripts=['openlp.pyw', 'scripts/openlp-1to2-converter.py', 'scripts/bible-1to2-converter.py'],
     include_package_data=True,
     zip_safe=False,
     install_requires=[