diff --git a/cms/envs/common.py b/cms/envs/common.py
index f7485589cf..fa60fd33c4 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -922,6 +922,8 @@ ADVANCED_COMPONENT_TYPES = [
     'edx_sga',
     'problem-builder',
     'pb-dashboard',
+    'poll',
+    'survey',
     # XBlocks from pmitros repos are prototypes. They should not be used
     # except for edX Learning Sciences experiments on edge.edx.org without
     # further work to make them robust, maintainable, finalize data formats,
diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt
index ec4e732710..a1ae335df4 100644
--- a/requirements/edx/github.txt
+++ b/requirements/edx/github.txt
@@ -57,3 +57,4 @@ git+https://github.com/edx/ecommerce-api-client.git@1.0.0#egg=ecommerce-api-clie
 
 # Third Party XBlocks
 -e git+https://github.com/mitodl/edx-sga@172a90fd2738f8142c10478356b2d9ed3e55334a#egg=edx-sga
+-e git+https://github.com/open-craft/xblock-poll@v1.0#egg=xblock-poll