diff --git a/artiq/frontend/artiq_gui.py b/artiq/frontend/artiq_gui.py
index 9f2b2f48a..a6278a28c 100755
--- a/artiq/frontend/artiq_gui.py
+++ b/artiq/frontend/artiq_gui.py
@@ -8,6 +8,7 @@ import atexit
 # it has chosen.
 from quamash import QEventLoop, QtGui
 from pyqtgraph import dockarea
+import os
 
 from artiq.protocols.file_db import FlatFileDB
 from artiq.protocols.pc_rpc import AsyncioClient
@@ -17,6 +18,8 @@ from artiq.gui.parameters import ParametersDock
 from artiq.gui.schedule import ScheduleDock
 from artiq.gui.log import LogDock
 
+data_dir = os.path.join(os.path.abspath(os.path.dirname(__file__)),
+                        "..", "gui")
 
 def get_argparser():
     parser = argparse.ArgumentParser(description="ARTIQ GUI client")
@@ -51,6 +54,7 @@ def main():
     atexit.register(lambda: schedule_ctl.close_rpc())
 
     win = QtGui.QMainWindow()
+    win.setWindowIcon(QtGui.QIcon(os.path.join(data_dir, "icon.png")))
     area = dockarea.DockArea()
     win.setCentralWidget(area)
     status_bar = QtGui.QStatusBar()
diff --git a/artiq/gui/icon.png b/artiq/gui/icon.png
new file mode 100644
index 000000000..33c071886
Binary files /dev/null and b/artiq/gui/icon.png differ
diff --git a/setup.py b/setup.py
index b783092fb..8192d6de9 100755
--- a/setup.py
+++ b/setup.py
@@ -2,6 +2,7 @@
 
 from setuptools import setup, find_packages
 import sys
+import os
 
 if sys.version_info[:3] < (3, 4, 3):
     raise Exception("You need at least Python 3.4.3 to run ARTIQ")
@@ -44,6 +45,7 @@ setup(
     packages=find_packages(),
     namespace_packages=[],
     test_suite="artiq.test",
+    package_data={"artiq": [os.path.join("gui", "icon.png")]},
     ext_modules=[],
     entry_points={
         "console_scripts": scripts,