diff --git a/conda/aiohttp/bld.bat b/conda/aiohttp/bld.bat
new file mode 100644
index 000000000..c40a9bbef
--- /dev/null
+++ b/conda/aiohttp/bld.bat
@@ -0,0 +1,2 @@
+"%PYTHON%" setup.py install
+if errorlevel 1 exit 1
diff --git a/conda/aiohttp/build.sh b/conda/aiohttp/build.sh
new file mode 100644
index 000000000..8e25a1455
--- /dev/null
+++ b/conda/aiohttp/build.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+$PYTHON setup.py install
diff --git a/conda/aiohttp/meta.yaml b/conda/aiohttp/meta.yaml
new file mode 100644
index 000000000..c251daaad
--- /dev/null
+++ b/conda/aiohttp/meta.yaml
@@ -0,0 +1,36 @@
+package:
+  name: aiohttp
+  version: "0.17.2"
+
+source:
+  fn: aiohttp-0.17.2.tar.gz
+  url: https://pypi.python.org/packages/source/a/aiohttp/aiohttp-0.17.2.tar.gz
+  md5: 7640928fd4b5c1ccf1f8bcad276d39d6
+
+build:
+  number: 0
+
+requirements:
+  build:
+    - python
+    - setuptools
+    - chardet
+
+  run:
+    - python
+    - chardet
+
+test:
+  # Python imports
+  imports:
+    - aiohttp
+
+  requires:
+    - chardet
+    - gunicorn
+    - nose
+
+about:
+  home: https://github.com/KeepSafe/aiohttp/
+  license: Apache Software License
+  summary: 'http client/server for asyncio'
diff --git a/conda/artiq/meta.yaml b/conda/artiq/meta.yaml
index 3de0d7250..45e0c194d 100644
--- a/conda/artiq/meta.yaml
+++ b/conda/artiq/meta.yaml
@@ -49,6 +49,7 @@ requirements:
         - pyqtgraph
         - flterm # [linux]
         - pygit2
+        - aiohttp
 
 test:
     imports: