diff --git a/setup.py b/setup.py
index fc5d9c71a9b3..efcd5dd0f203 100755
--- a/setup.py
+++ b/setup.py
@@ -79,17 +79,10 @@
     package_dir={
         'electrum': 'electrum'
     },
-    package_data={
-        '': ['*.txt', '*.json', '*.ttf', '*.otf', '*.csv'],
-        'electrum': [
-            'wordlist/*.txt',
-            'locale/*/LC_MESSAGES/electrum.mo',
-            'lnwire/*.csv',
-        ],
-        'electrum.gui': [
-            'icons/*',
-        ],
-    },
+    # Note: MANIFEST.in lists what gets included in the tar.gz, and the
+    # package_data kwarg lists what gets put in site-packages when pip installing the tar.gz.
+    # By specifying include_package_data=True, MANIFEST.in becomes responsible for both.
+    include_package_data=True,
     scripts=['electrum/electrum'],
     data_files=data_files,
     description="Lightweight Bitcoin Wallet",