diff --git a/playbooks/groups/proxies-miscellaneous.yml b/playbooks/groups/proxies-miscellaneous.yml
index 7a16eddc13..f2c9072802 100644
--- a/playbooks/groups/proxies-miscellaneous.yml
+++ b/playbooks/groups/proxies-miscellaneous.yml
@@ -19,6 +19,10 @@
     extensions:
     - .ico
 
+  - role: fedmsg/crl
+    website: fedoraproject.org
+    path: /fedmsg
+
   - role: httpd/fingerprints
     website: admin.fedoraproject.org
 
@@ -29,7 +33,7 @@
   - role: review-stats/proxy
     website: fedoraproject.org
     path: /PackageReviewStatus
- 
-  - role: fedmsg/crl
+
+  - role: membership-map/proxy
     website: fedoraproject.org
-    path: /fedmsg
+    path: /membership-map
diff --git a/playbooks/groups/proxies.yml b/playbooks/groups/proxies.yml
index d77c5c62b3..8d795034d2 100644
--- a/playbooks/groups/proxies.yml
+++ b/playbooks/groups/proxies.yml
@@ -49,11 +49,10 @@
   # - fedora-web::build (bapp0*)
   # - fedora-docs::build (bapp0*)
   # - review-stats::build (bapp0*)
+  # - membership-map::build (bapp0*)
   #
   # - smolt::proxy -- note going to do this.  smolt is dead.  long live smolt.
   #
-  # - membership-map::proxy
-  #
   # - httpd::nagios-proxy
   # - httpd::mailman-proxy
   # - httpd::status
diff --git a/roles/membership-map/proxy/files/sync-membership-map.cron b/roles/membership-map/proxy/files/sync-membership-map.cron
new file mode 100644
index 0000000000..5b1cb0fb67
--- /dev/null
+++ b/roles/membership-map/proxy/files/sync-membership-map.cron
@@ -0,0 +1 @@
+10,40 * * * * root /usr/bin/rsync -a --delete bapp02::membership-map/* /srv/web/membership-map/ >& /dev/null
diff --git a/roles/membership-map/proxy/tasks/main.yml b/roles/membership-map/proxy/tasks/main.yml
new file mode 100644
index 0000000000..d291749d7b
--- /dev/null
+++ b/roles/membership-map/proxy/tasks/main.yml
@@ -0,0 +1,25 @@
+- name: Ensure dir for content exists
+  file: dest=/srv/web/membership-map owner=root group=root mode=0755 state=directory
+  tags:
+  - membership-map
+  - membership-map/proxy
+
+- name: Put the proxy config in place
+  template: >
+    src=membership-map.conf
+    dest=/etc/httpd/conf.d/{{website}}/membership-map.conf
+    owner=root group=root mode=0644
+  notify:
+  - restart httpd
+  tags:
+  - membership-map
+  - membership-map/proxy
+
+- name: Install the sync-membership-map cronjob to pull content from builder
+  copy: >
+    src=sync-membership-map.cron dest=/etc/cron.d/sync-membership-map.cron
+    owner=root group=root mode=0644
+  tags:
+  - cron
+  - membership-map
+  - membership-map/proxy
diff --git a/roles/membership-map/proxy/templates/membership-map.conf b/roles/membership-map/proxy/templates/membership-map.conf
new file mode 100644
index 0000000000..a056a1d884
--- /dev/null
+++ b/roles/membership-map/proxy/templates/membership-map.conf
@@ -0,0 +1,6 @@
+Alias {{path}} /srv/web/membership-map
+
+<Directory /srv/web/membership-map>
+  Options Indexes
+  AllowOverride None
+</Directory>