diff --git a/MANIFEST.in b/MANIFEST.in
index a90d2af4..7e61731a 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -5,4 +5,3 @@ include onionshare/*.html
 include onionshare/strings.json
 include onionshare_gui/templates/*
 include onionshare_gui/static/*
-include setup/*
diff --git a/setup.py b/setup.py
index 9037863d..e982c265 100644
--- a/setup.py
+++ b/setup.py
@@ -16,9 +16,8 @@ version = open('version').read().strip()
 
 def get_data_files():
     if platform.system == 'Linux':
-        print 'linux oh yeah'
-        return [('/usr/share/applications', 'setup/onionshare.desktop'),
-                ('/usr/share/pixmaps', 'setup/onionshare80.xpm')]
+        return [('/usr/share/applications', ['setup/onionshare.desktop']),
+                ('/usr/share/pixmaps', ['setup/onionshare80.xpm'])]
     else:
         return None
 
@@ -39,5 +38,6 @@ setup(
     keywords='onion, share, onionshare, tor, anonymous, web server',
     packages=['onionshare', 'onionshare_gui'],
     scripts=['bin/onionshare', 'bin/onionshare-gui'],
-    data_files=get_data_files()
+    data_files=[('/usr/share/applications', ['setup/onionshare.desktop']),
+                ('/usr/share/pixmaps', ['setup/onionshare80.xpm'])]
 )