diff --git a/roles/pagure/upstreamfirst-frontend/files/upstreamfirst-master.html b/roles/pagure/upstreamfirst-frontend/files/upstreamfirst-master.html
new file mode 100644
index 0000000000..b788aa0a69
--- /dev/null
+++ b/roles/pagure/upstreamfirst-frontend/files/upstreamfirst-master.html
@@ -0,0 +1,202 @@
+
+
+
+
+
+ {% with messages = get_flashed_messages(with_categories=true) %}
+ {% if messages %}
+
+
+ {% for category, message in messages %}
+
+
+ ×
+ Close
+
+ {{ message }}
+
+ {% endfor %}
+
+
+ {% endif %}
+ {% endwith %}
+ {% if new_user %}
+
+
+
+
+ ×
+ Close
+
+
+ Welcome to {{ config['INSTANCE_NAME'] }}, {{ g.fas_user.username }}!
+
+
+
+ We are glad to welcome you to pagure.
+
+
+ In order to get started with pagure, to set-up
+ your preferred email address or your ssh key,
+ you may want to read the
+
+ First steps in Pagure documentation.
+
+
+ You may also find some more information on how to use pagure
+ in the
+ usage section of the documentation .
+
+
+
+
+
+ {% endif %}
+
+ {% block content %}{% endblock %}
+
+
+
+
+ {% block jscripts %}
+
+
+
+
+ {% endblock %}
+
+{% if config['FEDMENU_URL'] %}
+
+
+
+{% endif %}
+
+
+
diff --git a/roles/pagure/upstreamfirst-frontend/tasks/main.yml b/roles/pagure/upstreamfirst-frontend/tasks/main.yml
index f328d54670..c9ebed38d7 100644
--- a/roles/pagure/upstreamfirst-frontend/tasks/main.yml
+++ b/roles/pagure/upstreamfirst-frontend/tasks/main.yml
@@ -311,6 +311,21 @@
- web
- pagure
+############################################################
+# Setup the custom theme for the upstreamfirst instance
+############################################################
+- name: create the upstreamfirst theme dir
+ file: state=directory
+ path=/var/www/upstreamfirst-paguretheme/templates
+ owner=apache group=apache mode=0775
+ tags:
+ - web
+ - pagure
+
+- name: copy over custom master.html template
+ copy: src=upstreamfirst-master.html dest=/var/www/upstreamfirst-paguretheme/templates/master.html
+ tags:
+ - pagure
# Ensure all the services are up and running