diff --git a/playbooks/include/proxies-fedora-web.yml b/playbooks/include/proxies-fedora-web.yml
index bbc1162a1e..27e7fe9941 100644
--- a/playbooks/include/proxies-fedora-web.yml
+++ b/playbooks/include/proxies-fedora-web.yml
@@ -44,6 +44,9 @@
   - role: fedora-web/registry
     website: registry.fedoraproject.org
     when: env == "staging"
+  - role: fedora-web/codecs
+    website: codecs.fedoraproject.org
+    when: env == "staging"
 
   # Some other static content, not strictly part of "fedora-web" goes below here
   - role: fedora-docs/proxy
diff --git a/playbooks/include/proxies-redirects.yml b/playbooks/include/proxies-redirects.yml
index c02ec08dde..4dde3e5319 100644
--- a/playbooks/include/proxies-redirects.yml
+++ b/playbooks/include/proxies-redirects.yml
@@ -47,6 +47,12 @@
     website: fas.fedoraproject.org
     target: https://admin.fedoraproject.org/accounts/
 
+  - role: httpd/redirectmatch
+    name: codecs
+    website: codecs.fedoraproject.org
+    regex: /.*openh264.*.rpm$
+    target: https://fedoraproject.org/wiki/non-distributable-rpms
+
   - role: httpd/redirectmatch
     name: fpaste
     website: fpaste.org
diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml
index 1bb4741a17..b681ea1329 100644
--- a/playbooks/include/proxies-websites.yml
+++ b/playbooks/include/proxies-websites.yml
@@ -576,6 +576,13 @@
     sslonly: true
     cert_name: "{{wildcard_cert_name}}"
 
+  - role: httpd/website
+    name: codecs.fedoraproject.org
+    server_aliases: [codecs.stg.fedoraproject.org]
+    sslonly: true
+    cert_name: "{{wildcard_cert_name}}"
+    when: env == "staging"
+
   - role: httpd/website
     name: beaker.qa.fedoraproject.org
     server_aliases: [beaker.qa.fedoraproject.org]
diff --git a/roles/fedora-web/codecs/files/cron-sync-codecs b/roles/fedora-web/codecs/files/cron-sync-codecs
new file mode 100644
index 0000000000..90875deda2
--- /dev/null
+++ b/roles/fedora-web/codecs/files/cron-sync-codecs
@@ -0,0 +1 @@
+25 * * * *  root /usr/bin/rsync --delete -a --no-owner --no-group sundries01::codecs.fedoraproject.org/ /srv/web/codecs.fedoraproject.org/
diff --git a/roles/fedora-web/codecs/tasks/main.yml b/roles/fedora-web/codecs/tasks/main.yml
new file mode 100644
index 0000000000..7e19b4327d
--- /dev/null
+++ b/roles/fedora-web/codecs/tasks/main.yml
@@ -0,0 +1,5 @@
+- name: Copy in the sync-labs cronjob
+  copy: src=cron-sync-codecs dest=/etc/cron.d/sync-codecs
+  tags:
+  - fedora-web
+  - fedora-web/codecs
diff --git a/roles/rsyncd/files/rsyncd.conf.sundries b/roles/rsyncd/files/rsyncd.conf.sundries
index b23e3d9d3e..59f6f2e723 100644
--- a/roles/rsyncd/files/rsyncd.conf.sundries
+++ b/roles/rsyncd/files/rsyncd.conf.sundries
@@ -157,3 +157,11 @@ uid = root
 gid = root
 read only = yes
 hosts allow = 10.5.126.0/255.255.255.0 192.168.0.0/255.255.0.0
+
+[codecs.fedoraproject.org]
+comment = codecs.fedoraproject.org
+path = /srv/web/codecs.fedoraproject.org
+uid = root
+gid = root
+read only = yes
+hosts allow = 10.5.126.0/255.255.255.0 192.168.0.0/255.255.0.0