diff --git a/conda/zipline/meta.yaml b/conda/zipline/meta.yaml
index 77303ce4..4eda4523 100644
--- a/conda/zipline/meta.yaml
+++ b/conda/zipline/meta.yaml
@@ -19,7 +19,6 @@ requirements:
     - pandas
     - scipy
     - matplotlib
-    - ta-lib
     - logbook
 
 test:
diff --git a/etc/requirements.txt b/etc/requirements.txt
index baea4bab..2f7cc685 100644
--- a/etc/requirements.txt
+++ b/etc/requirements.txt
@@ -17,12 +17,5 @@ statsmodels==0.5.0
 python-dateutil==2.2
 six==1.6.1
 
-# Cython is required for TA-Lib
-Cython==0.20.1
-# This --allow syntax is for compatibility with pip >= 1.5
-# However, this is backwards incompatible change, since previous
-# versions of pip do not support that flag.
---allow-external TA-Lib --allow-unverified TA-Lib TA-Lib==0.4.8
-
 # For fetching remote data
 requests==2.3.0
diff --git a/etc/requirements_dev.txt b/etc/requirements_dev.txt
index 5f4537ac..4da6201c 100644
--- a/etc/requirements_dev.txt
+++ b/etc/requirements_dev.txt
@@ -24,3 +24,10 @@ tornado==3.2.1
 pyparsing==2.0.2
 
 Markdown==2.4.1
+
+# Cython is required for TA-Lib
+Cython==0.20.1
+# This --allow syntax is for compatibility with pip >= 1.5
+# However, this is backwards incompatible change, since previous
+# versions of pip do not support that flag.
+--allow-external TA-Lib --allow-unverified TA-Lib TA-Lib==0.4.8
diff --git a/setup.py b/setup.py
index bd6ceb85..1ca18e20 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2013 Quantopian, Inc.
+# Copyright 2014 Quantopian, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -71,5 +71,8 @@ setup(
         'pandas',
         'six'
     ],
+    extras_require = {
+        'talib':  ["talib"],
+    },
     url="https://github.com/quantopian/zipline"
 )