diff --git a/roles/planet/files/people_base_config b/roles/planet/files/people_base_config
new file mode 100644
index 0000000000..cdd4d66427
--- /dev/null
+++ b/roles/planet/files/people_base_config
@@ -0,0 +1,70 @@
+[Planet]
+name = Fedora People
+link = http://fedoraproject.org/people/
+owner_name = Fedora Admin
+owner_email = admin@fedoraproject.org
+cache_directory = /srv/planet/config/people/cache
+template_files = /srv/planet/config/people/templates/index.html.tmpl /srv/planet/config/people/templates/rss20.xml.tmpl /srv/planet/config/people/templates/rss10.xml.tmpl /srv/planet/config/people/templates/opml.xml.tmpl /srv/planet/config/people/templates/foafroll.xml.tmpl /srv/planet/config/people/templates/atom.xml.tmpl /srv/planet/config/people/templates/heads.html.tmpl
+output_dir = /srv/planet/site/people
+items_per_page = 50
+log_level = ERROR
+date_format = %B %d, %Y %I:%M %p
+spider_threads = 20
+fedmsg_enabled = 1
+
+#
+#     [DEFAULT]
+#     facewidth = 64
+#     faceheight = 64
+#
+#     [http://www.blog.com/rss]
+#     face = foo.png
+#     faceheight = 32
+#
+# The facewidth of the defined blog defaults to 64.
+
+[DEFAULT]
+face = http://planet.fedoraproject.org/images/heads/default.png
+
+[http://dailypackage.fedorabook.com/index.php?/feeds/index.rss2]
+name = fedora daily package
+face = http://planet.fedoraproject.org/imgages/heads/fdp.png
+fasname = admin
+
+[http://www.redhatmagazine.com/category/fedora/feed]
+name = Red Hat Magazine Feed
+fasname = admin
+
+[http://fedorauniversity.wordpress.com/feed/]
+name = Fedora University Tour
+fasname = admin
+
+[http://www.archive.org/services/collection-rss.php]
+name = Fedora Videos
+filters = regexp_sifter.py?require=[Ff]edora
+fasname = admin
+
+[http://www.projetofedora.org/rss.xml]
+name = Projeto Fedora Brasil
+face = http://planet.fedoraproject.org/images/heads/map_brazil_fedora_small.png
+fasname = admin
+
+[http://www.fedora-tunisia.org/?q=atom/feed]
+name = Fedora Tunisia
+face = http://planet.fedoraproject.org/images/heads/default.png
+fasname = admin
+
+[http://fedoramagazine.org/?feed=rss2]
+name = Fedora Magazine
+face = https://fedoramagazine.org/wp-content/themes/ar2-d57c18d/images/logo.png
+fasname = admin
+
+[https://badges.fedoraproject.org/explore/badges/rss]
+name = Fedora Badges
+face = http://planet.fedoraproject.org/images/heads/default.png
+fasname = admin
+
+[http://status.fedoraproject.org/changes.rss]
+name = Fedora Infrastructure Status
+face = http://planet.fedoraproject.org/images/heads/default.png
+fasname = admin
diff --git a/roles/planet/files/planet-cron b/roles/planet/files/planet-cron
new file mode 100644
index 0000000000..311d337e70
--- /dev/null
+++ b/roles/planet/files/planet-cron
@@ -0,0 +1,3 @@
+*/20 * * * * planet-user bash /usr/local/bin/pull-run-planet-config.sh /etc/planet/fpbuilder.conf mainplanet>>/dev/null 2>&1
+34 6,8,10,12,14,16,18,20,22 * * * root bash /srv/planet/config/info/yum-rss/makerss
+*/20 * * * * planet-user bash /srv/planet/config/run-planet info >>/dev/null 2>&1
diff --git a/roles/planet/files/planet.conf b/roles/planet/files/planet.conf
new file mode 100644
index 0000000000..ed80bcc536
--- /dev/null
+++ b/roles/planet/files/planet.conf
@@ -0,0 +1,78 @@
+<VirtualHost *:80>
+    ##
+    # Domain: planet.fedoraproject.org
+    # Owner: admin@fedoraproject.org
+    #
+    ServerAdmin admin@fedoraproject.org
+    ServerName planet.fedoraproject.org
+
+    DocumentRoot "/srv/planet/site/"
+
+    ErrorLog logs/planet-error.log
+    CustomLog logs/planet.fedoraproject.org-access.log common
+
+    UserDir disable
+    AddCharset UTF-8 .xml
+
+    <Location /images/>
+        ExpiresActive On
+        ExpiresDefault "access plus 5 days"
+    </Location>
+
+    <Location /css/>
+        ExpiresActive On
+        ExpiresDefault "access plus 5 days"
+    </Location>
+
+    <Directory "/srv/planet/site/">
+      Options Indexes FollowSymLinks
+    </Directory>
+
+    RedirectMatch 301 /favicon\.ico$ http://fedoraproject.org/static/images/favicon.ico
+    Redirect /ldc http://fedoraldc.wordpress.com/feed/
+    Alias /justfedora /srv/planet/site/edited
+
+</VirtualHost>
+<VirtualHost 152.19.134.191:443 [2610:28:3090:3001:5054:ff:fedb:7f5a]:443>
+    ##
+    # Domain: planet.fedoraproject.org
+    # Owner: admin@fedoraproject.org
+    #
+    ServerAdmin admin@fedoraproject.org
+    ServerName planet.fedoraproject.org
+
+    SSLEngine on
+    SSLCertificateFile    /etc/pki/tls/certs/planet.fedoraproject.org.cert
+    SSLCertificateKeyFile /etc/pki/tls/private/planet.fedoraproject.org.key
+    SSLCertificateChainFile /etc/pki/tls/certs/wildcard-2014.fedorapeople.org.intermediate.cert
+    SSLHonorCipherOrder On
+    SSLCipherSuite ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!3DES:!MD5:!PSK
+    SSLProtocol -All +TLSv1 +TLSv1.1 +TLSv1.2
+
+    DocumentRoot "/srv/planet/site/"
+
+    ErrorLog logs/planet-error.log
+    CustomLog logs/planet.fedoraproject.org-access.log common
+
+    UserDir disable
+    AddCharset UTF-8 .xml
+
+    <Location /images/>
+        ExpiresActive On
+        ExpiresDefault "access plus 5 days"
+    </Location>
+
+    <Location /css/>
+        ExpiresActive On
+        ExpiresDefault "access plus 5 days"
+    </Location>
+
+    <Directory "/srv/planet/site/">
+      Options Indexes FollowSymLinks
+    </Directory>
+
+    RedirectMatch 301 /favicon\.ico$ https://fedoraproject.org/static/images/favicon.ico
+    Redirect /ldc http://fedoraldc.wordpress.com/feed/
+    Alias /justfedora /srv/planet/site/edited
+
+</VirtualHost>
diff --git a/roles/planet/files/planetconfigbuilder.py b/roles/planet/files/planetconfigbuilder.py
new file mode 100644
index 0000000000..f87a1d2991
--- /dev/null
+++ b/roles/planet/files/planetconfigbuilder.py
@@ -0,0 +1,176 @@
+#!/usr/bin/python
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Library General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Copyright 2008 (c) Red Hat, Inc - written by Seth Vidal <skvidal@fedoraproject.org>
+
+from ConfigParser import ConfigParser, ParsingError
+import os
+import os.path
+import sys
+import pwd
+import time
+
+class Config(object):
+    def __init__(self, fn='/etc/planetbuilder.conf'):
+        """read in our config data"""
+        self.ignore_users = []
+        self.banned_stanzas = ['Planet', 'main', 'DEFAULT']
+        self.base_config = None
+        self.group = None
+        self.output = sys.stdout
+        self.output_fn = None
+        
+        cp = ConfigParser()
+        cp.read(fn)
+        if cp.has_section('main'):
+            if cp.has_option('main', 'base_config'):
+                self.base_config = cp.get('main', 'base_config')
+            if cp.has_option('main', 'group'):
+                self.group = cp.get('main', 'group')
+                
+            if cp.has_option('main', 'ignore_users'):
+                iu = cp.get('main', 'ignore_users')
+                iu = iu.replace(',',' ')    
+                for user in iu.split(' '):
+                    self.ignore_users.append(user)
+            if cp.has_option('main', 'banned_stanzas'):
+                bs = cp.get('main', 'banned_stanzas')
+                bs = bs.replace(',',' ')    
+                for banned in bs.split(' '):
+                    self.banned_stanzas.append(banned)
+            if cp.has_option('main', 'output'):
+                of = cp.get('main', 'output')
+                self.output = open(of, 'w')
+                self.output_fn = of
+                
+def error_print(msg):
+    print >> sys.stderr, msg
+    
+class PlanetBuilderException(Exception):
+    def __init__(self, value=None):
+        Exception.__init__(self)
+        self.value = value
+
+    def __str__(self):
+        return "%s" %(self.value,)
+
+
+class PlanetBuilder(object):
+    def __init__(self, config_file):
+        self.entries = {}
+        self.conf = Config(config_file)
+        
+    def add(self, entry):
+        if not entry.feed or not entry.name:
+            raise PlanetBuilderException, "entry %s lacks feed or name" % entry
+
+        if entry.feed in self.conf.banned_stanzas:
+            raise PlanetBuilderException, "entry %s is in banned list" % entry
+        
+        if self.entries.has_key(entry.feed):
+            raise PlanetBuilderException, "entry %s already exists in list" % entry
+
+        self.entries[entry.feed] = entry
+
+    def compile(self):
+        result = "#planet config compiled on %s\n" % time.ctime()
+        result += "#using group %s and config %s\n" % (self.conf.group, self.conf.base_config)
+        if self.conf.base_config:
+            bc = open(self.conf.base_config, 'r').read()
+            result += bc
+        
+        for e in self.entries.values():
+            e_format = "# Origin: %s\n" % (e.origin)
+            e_format += "[%s]\nname=%s\n" % (e.feed, e.name)
+            if e.face:
+                e_format += "face=%s\n" % (e.face)
+            if e.username:
+                e_format += "fasname=%s\n" % (e.username)
+            result += e_format
+            result += "\n"
+
+        self.result = result
+
+    def produce_output(self):
+        self.conf.output.write(self.result)        
+        self.conf.output.close()
+                    
+class PlanetEntry(object):
+
+    def __init__(self, origin, feed=None, name=None, face=None, username=None):
+        self.origin = origin
+        self.feed = feed
+        self.name = name
+        self.username = username
+        if not name:
+            self.name = origin
+        self.face = face
+
+    def __str__(self):
+        return '%s:%s' % (self.origin, self.feed)
+
+class PlanetFile(object):
+    def __init__(self, filename, username):
+        self.entries = []
+        # open up with cp
+        cp = ConfigParser()
+        try:
+            cp.read(filename)
+        except ParsingError, e:
+            error_print("Problem parsing %s - %s" % (filename, str(e)))
+            return
+            
+        for s in cp.sections():
+            name = face = None
+            if cp.has_option(s, 'name'):
+                name = cp.get(s, 'name')
+            if cp.has_option(s, 'face'):
+                face = cp.get(s, 'face')
+            e = PlanetEntry(filename, feed=s, name=name, face=face, username=username)
+            self.entries.append(e)
+    
+    def __iter__(self):
+        return self.entries.__iter__()
+    
+def main(config_file='/etc/planetbuilder.conf'):
+    pb = PlanetBuilder(config_file)
+
+    fn = '.planet'
+    if pb.conf.group:
+        fn = '.planet.%s' % pb.conf.group
+        
+    for (n, p, u, g, c, h, s) in pwd.getpwall():
+        if u < 500:
+            continue
+        if n in pb.conf.ignore_users:
+            continue
+        
+        if os.path.exists(h + '/' + fn):
+            for entry in PlanetFile(h + '/' + fn, n):
+                pb.add(entry)
+
+    pb.compile()
+    pb.produce_output()
+    print pb.conf.output_fn
+
+
+if __name__ == "__main__":
+    if len(sys.argv) > 1:
+        main(sys.argv[1])
+    else:
+        main()
+        
+        
+    
+    
diff --git a/roles/planet/files/pull-run-planet-config.sh b/roles/planet/files/pull-run-planet-config.sh
new file mode 100644
index 0000000000..002d532b69
--- /dev/null
+++ b/roles/planet/files/pull-run-planet-config.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# take location of planet config
+# pull it and run planet against it
+
+buildconfig=$1
+if [ ! -z "$2" ]; then 
+    planetname="$2"
+else
+    planetname=`echo $buildconfig| cut -d'/' -f4`
+fi
+
+planetcmd=/usr/bin/venus-planet
+buildcfgcmd="/usr/local/bin/planetconfigbuilder.py $1"
+cfgfile=`$buildcfgcmd`
+if [ $? != 0 ]; then
+   echo "could not build config file for $1"
+fi
+
+/usr/local/bin/lock-wrapper "$planetname" "$planetcmd $cfgfile"
+
diff --git a/roles/planet/files/run-planet b/roles/planet/files/run-planet
new file mode 100755
index 0000000000..d07f904789
--- /dev/null
+++ b/roles/planet/files/run-planet
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+if [ -z $1 ]; then
+   echo "You must specify a planet name" >&2
+   exit 1
+fi
+
+if [ -f /srv/planet/config/$1/config.ini ]; then
+    /usr/local/bin/lock-wrapper "$1" "/usr/bin/venus-planet /srv/planet/config/$1/config.ini"
+else
+    echo "Cannot find /srv/planet/config/$1/config.ini - Exiting" >&2
+    exit 1
+fi
+
+
+
+
diff --git a/roles/planet/files/selinux/planet.pp b/roles/planet/files/selinux/planet.pp
new file mode 100644
index 0000000000..9aa10237fa
Binary files /dev/null and b/roles/planet/files/selinux/planet.pp differ
diff --git a/roles/planet/files/selinux/planet.te b/roles/planet/files/selinux/planet.te
new file mode 100644
index 0000000000..dad5fb7f1d
--- /dev/null
+++ b/roles/planet/files/selinux/planet.te
@@ -0,0 +1,13 @@
+policy_module(planet,1.0.0)
+
+gen_require(`
+	type httpd_t;
+	type httpd_git_script_t;
+	type user_home_t;
+')
+
+userdom_list_all_users_home_dirs(httpd_t);
+userdom_list_all_users_home_dirs(httpd_git_script_t);
+
+allow httpd_git_script_t user_home_t:dir read;
+allow httpd_t user_home_t:dir read;
diff --git a/roles/planet/files/sub-planets/design/base_config b/roles/planet/files/sub-planets/design/base_config
new file mode 100644
index 0000000000..ecf95cd693
--- /dev/null
+++ b/roles/planet/files/sub-planets/design/base_config
@@ -0,0 +1,26 @@
+[Planet]
+name = Fedora Design Team Planet
+link = http://planet.fedoraproject.org/design/
+owner_name = Fedora Admin
+owner_email = admin@fedoraproject.org
+cache_directory = /srv/planet/config/design/cache
+template_files = /srv/planet/config/design/templates/index.html.tmpl /srv/planet/config/design/templates/rss20.xml.tmpl /srv/planet/config/design/templates/rss10.xml.tmpl //srv/planet/config/design/templates/opml.xml.tmpl ///srv/planet/config/design/templates/foafroll.xml.tmpl ////srv/planet/config/design/templates/atom.xml.tmpl /////srv/planet/config/design/templates/heads.html.tmpl 
+output_dir = /srv/planet/site/design
+items_per_page = 50
+log_level = ERROR
+date_format = %B %d, %Y %I:%M %p
+spider_threads=20
+#
+#     [DEFAULT]
+#     facewidth = 64
+#     faceheight = 64
+#
+#     [http://www.blog.com/rss]
+#     face = foo.png
+#     faceheight = 32
+#
+# The facewidth of the defined blog defaults to 64.
+
+[DEFAULT]
+face = http://planet.fedoraproject.org/images/heads/default.png
+
diff --git a/roles/planet/files/sub-planets/design/css/content.css b/roles/planet/files/sub-planets/design/css/content.css
new file mode 100644
index 0000000000..982924ee61
--- /dev/null
+++ b/roles/planet/files/sub-planets/design/css/content.css
@@ -0,0 +1,237 @@
+.name-project, .name-release, .name-version {
+}
+
+/* Front page H1 */
+#page-main h1 {
+	font-size: 1.35em;
+}
+
+#page-main h1.center {
+	text-align: center;
+}
+
+h1, h2, h3, h4 {
+	/*
+	font-style: italic;
+	*/
+	font-family: luxi sans,sans-serif;
+}
+h1 {
+	font-size: 1.75em;
+}
+
+h2 {
+	font-size: 1.25em;
+#	background-color: #eee;
+}
+
+h3 {
+	font-size: 1.1em;
+}
+
+hr {
+	border: 0;
+	border-bottom: 1px solid #ccc;
+}
+
+.fedora-side-right-content {
+	padding: 1 5px 1.5em;
+	font-size: 1em;
+}
+#fedora-side-right h1, #fedora-side-right h2, #fedora-side-right h3 {
+	margin: 0;
+	padding: 0 4pt 0;
+	font-size: 1em;
+	letter-spacing: 2pt;
+	border-bottom: 1px solid #bbb;
+}
+#fedora-side-right hr {
+	border-bottom: 1px solid #aaa;
+	margin: 0.5em 0;
+}
+
+table tr {
+	font-size: 0.9em; 
+}
+
+
+#link-offsite {
+}
+.link-offsite-notation {
+	font-size: 0.9em;
+	color: #777;
+	padding-left: 1pt;
+	text-decoration: none !important;
+}
+#fedora-content .link-offsite-notation {
+	color: #999;
+}
+#link-redhat {
+}
+#fedora-content #link-redhat {
+}
+#link-internal {
+}
+
+#fedora-content li {
+	padding: 1pt;
+}
+#fedora-content h1 {
+	margin-top: 0;
+}
+
+#fedora-content a img {
+	margin: 1px;
+	border: 0;
+}
+#fedora-content a:hover img {
+	margin: 0;
+	border: 1px solid #f00;
+}
+#fedora-content a img.noborder {
+	margin: 0;
+	border: 0;
+}
+#fedora-content a:hover img .noborder {
+	margin: 0;
+	border: 0;
+}
+
+#fedora-project-maintainers p, #fedora-project-contributors p, #fedora-project-bugs p {
+	margin-left: 5pt;
+}
+
+#fedora-project-download dt {
+	font-weight: bold;
+	margin-top: 8pt;
+	margin-left: 5pt;
+}
+#fedora-project-download dd {
+	padding: 0;
+	margin: 10px 20px 0;
+}
+#fedora-project-screenshots a img {
+	margin: 5px;
+}
+#fedora-project-screenshots a:hover img {
+	margin: 4px;
+}
+#fedora-project-todo ul {
+	border: 1px solid #cad4e9;
+	margin: 0 1em;
+	padding: 0;
+	list-style: none;
+	border-radius: 2.5px;
+	-moz-border-radius: 2.5px;
+}
+#fedora-project-todo li {
+	margin: 0;
+	padding: 6px 8px;
+}
+#fedora-project-todo li.odd {
+	background-color: #ecf0f7;
+}
+#fedora-project-todo li.even {
+	background-color: #f7f9fc;
+}
+
+#fedora-list-packages {
+	border-collapse: collapse;
+	border: 1px solid #cad4e9;
+	border-radius: 2.5px;
+	-moz-border-radius: 2.5px;
+}
+#fedora-list-packages tr.odd td {
+	background-color: #ecf0f7;
+}
+#fedora-list-packages tr.even td {
+	background-color: #f7f9fc;
+}
+#fedora-list-packages th,
+#fedora-list-packages td {
+	margin: 0;
+	padding: 6px 8px;
+}
+#fedora-list-packages td.column-2 {
+	text-align: center;
+}
+#fedora-list-packages th {
+	background-color: #cad4e9;
+	color: #000;
+	font-weight: bold;
+	text-align: center;
+
+}
+
+/* pre.screen is for DocBook HTML output */
+code.screen, pre.screen {
+	font-family: monospace;
+	font-size: 1em;
+	display: block;
+	padding: 10px;
+	border: 1px solid #bbb;
+	background-color: #eee;
+	color: #000;
+	overflow: auto;
+	border-radius: 2.5px;
+	-moz-border-radius: 2.5px;
+	margin: 0.5em 2em;
+}
+#fedora-project code.screen {
+	margin: 0;
+}
+
+code.command, code.filename {
+	font-family: monospace;
+}
+
+code.citetitle {
+	font-family: sans-serif;
+	font-style: italic;
+}
+
+strong.application {
+	font-weight: bold;
+}
+.indent {
+	margin: 0 2em;
+}
+.fedora-docs-nav {
+	text-align: center;
+	position: relative;
+	padding: 1em;
+	margin-top: 2em;
+	border-top: 1px solid #ccc;
+}
+.fedora-docs-nav a {
+	padding: 0 1em;
+}
+.fedora-docs-nav-left {
+	position: absolute;
+	left: 0;
+}
+.fedora-docs-nav-right {
+	position: absolute;
+	right: 0;
+}
+
+.fedoraEntry {
+
+padding-left: 10px;
+padding-right: 10px;
+padding-bottom: 10px;
+padding-top: 10px;
+border-bottom: 1px solid #ccc;
+}
+
+.fedoraStory {
+}
+
+.fedoraFace {
+	margin: 0 0 10px 10px;
+	float: right;
+}
+
+.fedoraTitle {
+	font-size: 1.25em;
+}
diff --git a/roles/planet/files/sub-planets/design/css/docbook.css b/roles/planet/files/sub-planets/design/css/docbook.css
new file mode 100644
index 0000000000..3181bce246
--- /dev/null
+++ b/roles/planet/files/sub-planets/design/css/docbook.css
@@ -0,0 +1,71 @@
+#fedora-content li p {
+	margin: 0.2em;
+}
+
+#fedora-content div.table table {
+	width: 95%;
+	background-color: #DCDCDC; 
+	color: #000000;
+	border-spacing: 0;
+}
+
+#fedora-content div.table table th {
+	border: 1px solid #A9A9A9;	
+	background-color: #A9A9A9;
+	color: #000000;
+}
+
+#fedora-content div.table table td {
+	border: 1px solid #A9A9A9; 
+	background-color: #DCDCDC;
+	color: #000000;
+	padding: 0.5em;
+	margin-bottom: 0.5em;
+	margin-top: 2px; 
+
+}
+
+div.note table, div.tip table, div.important table, div.caution table, div.warning table {
+	width: 95%;
+	border: 2px solid #B0C4DE;
+	background-color: #F0F8FF;
+	color: #000000;
+	/* padding inside table area */
+	padding: 0.5em;
+	margin-bottom: 0.5em;
+	margin-top: 0.5em;
+}
+
+/* "Just the FAQs, ma'm." */
+.qandaset table {
+	border-collapse: collapse;
+}
+.qandaset {
+}
+.qandaset tr.question {
+}
+.qandaset tr.question td {
+	font-weight: bold;
+	padding: 0 0.5em;
+	margin: 0;
+}
+.qandaset tr.answer td {
+	padding: 0 0.5em 1.5em;
+	margin: 0;
+}
+.qandaset tr.question td, .qandaset tr.answer td {
+	vertical-align: top;
+}
+.qandaset strong {
+	text-align: right;
+}
+
+.article .table table {
+	border: 0;
+	margin: 0 auto;
+	border-collapse: collapse;
+}
+.article .table table th {
+	padding: 5px;
+	text-align: center;
+}
diff --git a/roles/planet/files/sub-planets/design/css/layout.css b/roles/planet/files/sub-planets/design/css/layout.css
new file mode 100644
index 0000000000..6ceba83ce0
--- /dev/null
+++ b/roles/planet/files/sub-planets/design/css/layout.css
@@ -0,0 +1,362 @@
+	body {
+	font-size: 0.9em;
+	font-family: bitstream vera sans,sans-serif;
+	margin: 0;
+	padding: 0;
+	/* (The background color is specified elsewhere, so do a global replacement if it ever changes) */
+	background-color: #d9d9d9;
+}
+
+a:link {
+	color: #900;
+}
+a:visited {
+	color: #48468f;
+}
+a:hover {
+	color: #f20;
+}
+a[name] {
+	color: inherit;
+	text-decoration: inherit;
+}
+
+#fedora-header {
+	background-color: #fff;
+	height: 62px;
+}
+#fedora-header img {
+	border: 0;
+	vertical-align: middle;
+}
+#fedora-header-logo {
+	/* position is offset by the header padding amount */
+	position: absolute;
+	left: 26px;
+	top: 13px;
+	z-index: 3;
+}
+#fedora-header-logo img {
+	width: 110px;
+	height: 40;
+}
+#fedora-header-items {
+	/* position is offset by the header padding amount */
+	position: absolute;
+	right: 10px;
+	top: 15px;
+	text-align: right;
+	display: inline;
+}
+#fedora-header-items a {
+	color: #000;
+	text-decoration: none;
+	padding: 7pt;
+	font-size: 0.8em;
+}
+#fedora-header-items a:hover, #fedora-header-search-button:hover {
+	color: #f20;
+	cursor: pointer;
+}
+#fedora-header-items img {
+	margin-right: 1px;
+	width: 36px;
+	height: 36px;
+}
+#fedora-header-search {
+	height: 25px;
+}
+#fedora-header-search-entry {
+	vertical-align: top;
+	margin: 0.65em 4px 0 10px;
+	padding: 2px 4px;
+	background-color: #f5f5f5;
+	border: 1px solid #999;
+	font-size: 0.8em !important;
+}
+#fedora-header-search-entry:focus {
+	background-color: #fff;
+	border: 1px solid #555;
+}
+#fedora-header-search-button {
+	font-size: 0.8em !important;
+	vertical-align: top;
+	margin-top: 0.2em;
+	border: 0;
+	padding: 7px;
+	background: #fff url('../images/header-search.png') no-repeat left;
+	padding-left: 21px;
+}
+#fedora-header-items form {
+	float: right;
+}
+#fedora-header-items input {
+	font-size: 0.85em;
+}
+#fedora-nav {
+	margin: 0;
+	padding: 0;
+	background-color: #22437f;
+	font-size: 0;
+	height: 5px;
+	border-top: 1px solid #000;
+	border-bottom: 1px solid #f5f5f5;
+}
+#fedora-nav ul {
+	margin: 0;
+	padding: 0;
+}
+#fedora-nav li {
+	display: inline;
+	list-style: none;
+	padding: 0 5pt;
+}
+#fedora-nav li + li {
+	padding-left: 8pt;
+	border-left: 1px solid #99a5bf;
+}
+#fedora-nav a {
+	color: #c5ccdb;
+	text-decoration: none;
+}
+#fedora-nav a:hover {
+	color: #fff;
+}
+
+#fedora-side-left {
+	position: absolute;
+	z-index: 2;
+	width: 11em; 
+	/* Space down for the approx line height (fonts) */
+	left: 12px;
+}
+#fedora-side-right {
+	position: absolute;
+	z-index: 1;
+	width: 20em;
+	right: 12px;
+	padding-top: 3px;
+	}
+#fedora-side-left, #fedora-side-right {
+	top: 2px;
+	/* add to the top margin to compensate for the fixed sizes */
+	margin-top: 75px;
+	color: #555;
+	font-size: 0.9em;
+}
+#fedora-side-right ul {
+	list-style: square inside;
+	padding: 0;
+	margin: 0;
+}
+
+/* Left-side naviagation */
+#fedora-side-nav-label {
+	display: none;
+}
+#fedora-side-nav {
+	list-style: none;
+	margin: 0;
+	padding: 0;
+	border: 1px solid #5976b2;
+	border-top: 0;
+	background-color: #22437f;
+}
+#fedora-side-nav li {
+	margin: 0;
+	padding: 0;
+	border-top: 1px solid #5976b2;
+	/* IE/Win gets upset if there is no bottom border... Go figure. */
+	border-bottom: 1px solid #22437f;
+}
+#fedora-side-nav a {
+	margin: 0;
+	color: #c5ccdb;
+	display: block;
+	text-decoration: none;
+	padding: 4px 6px;
+}
+#fedora-side-nav a:hover {
+	background-color: #34548f;
+	color: #fff;
+}
+#fedora-side-nav ul {
+	list-style: none;
+	margin: 0;
+	padding: 0;
+}
+#fedora-side-nav ul li {
+	border-top: 1px solid #34548e;
+	background-color: #34548e;
+	/* IE/Win gets upset if there is no bottom border... Go figure. */
+	border-bottom: 1px solid #34548e;
+}
+#fedora-side-nav ul li:hover {
+	border-bottom: 1px solid #34548f;
+}
+#fedora-side-nav ul li a {
+	padding-left: 12px;
+	color: #a7b2c9;
+}
+#fedora-side-nav ul li a:hover {
+	background-color: #46659e;
+}
+#fedora-side-nav ul ul li a {
+	padding-left: 18px;
+}
+#fedora-side-nav strong a {
+	font-weight: normal;
+	color: #fff !important;
+	background-color: #10203b;
+}
+#fedora-side-nav strong a:hover {
+	background-color: #172e56 !important;
+}
+
+/* content containers */
+#fedora-middle-one, #fedora-middle-two, #fedora-middle-three {
+	font-size: 0.9em;
+	/* position: relative; */ /* relative to utilize z-index */
+	width: auto;
+	min-width: 120px;
+	margin: 10px;
+	z-index: 3; /* content can overlap when the browser is narrow */
+}
+/*
+#fedora-middle-two, #fedora-middle-three {
+	margin-left: 11em;
+	padding-left: 24px;
+}
+*/
+#fedora-middle-three {
+	margin-right: 20em;
+	padding-right: 24px;
+}
+
+#fedora-content {
+	padding: 24px;
+	border: 1px solid #aaa;
+	background-color: #fff;
+}
+
+#fedora-content > .fedora-corner-bottom { top: 0 }
+
+.fedora-corner-tl, .fedora-corner-tr, .fedora-corner-bl, .fedora-corner-br {
+	background-color: #d9d9d9;
+	position: relative;
+	width: 19px;
+	height: 19px;
+	/* The following line is to render PNGs with alpha transparency within IE/Win, using DirectX */
+	/* Work-around for IE6/Mac borkage (Part 1) */
+	display: none;
+}
+
+.fedora-corner-tl, .fedora-corner-bl { float: left; left: 0px; }
+.fedora-corner-tr, .fedora-corner-br { float: right; right: 0px; }
+.fedora-corner-tl, .fedora-corner-tr { top: 0px; }
+.fedora-corner-bl, .fedora-corner-br { bottom: 0px; margin-top: -19px; }
+
+
+html>body .fedora-corner-tl { background: #d9d9d9 url("../images/corner-tl.png") no-repeat left top; }
+html>body .fedora-corner-tr { background: #d9d9d9 url("../images/corner-tr.png") no-repeat right top; }
+html>body .fedora-corner-bl { background: #d9d9d9 url("../images/corner-bl.png") no-repeat left bottom; }
+html>body .fedora-corner-br { background: #d9d9d9 url("../images/corner-br.png") no-repeat right bottom; }
+
+.fedora-corner-tl { filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/corner-tl.png',sizingMethod='scale'); }
+.fedora-corner-tr { filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/corner-tr.png',sizingMethod='scale'); }
+.fedora-corner-br { filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/corner-br.png',sizingMethod='scale'); }
+.fedora-corner-bl { filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/corner-bl.png',sizingMethod='scale'); }
+
+/* \*/
+.fedora-corner-tl, .fedora-corner-tr, .fedora-corner-bl, .fedora-corner-br {
+	/* Restore the view for everything but IE6/Mac (part 2 of the "IE/Mac fix") */
+	display: block;
+}
+/* */
+
+html*.fedora-corner-bl, html*.fedora-corner-br {
+	/* Compensate for Opera's inability to position some things correctly (Part 2) */
+	top: 0px;
+}
+
+.content { margin: 0 1em }
+
+#fedora-sidelist {
+	position: relative;
+	bottom: 3px;
+	margin: 0;
+	padding: 3px !important;
+	border: 1px solid #bbb;
+	background-color: #ccc;
+	border-radius: 2.5px;
+	-moz-border-radius: 2.5px;
+}
+#fedora-sidelist strong a {
+	font-weight: normal;
+	background-color: #555;
+	color: #fff;
+}
+#fedora-sidelist strong a:hover {
+	background-color: #333;
+	color: #fff;
+}
+#fedora-sidelist li {
+	list-style-position: outside;
+	font-size: 0.9em;
+	list-style: none;
+	border: 1px solid #ccc;
+	border-width: 1px 0;
+	padding: 0;
+	list-style: none;
+}
+#fedora-sidelist li a {
+	text-decoration: none;
+	display: block;
+	padding: 6px 8px;
+	border-radius: 2.5px;
+	-moz-border-radius: 2.5px;
+}
+#fedora-sidelist li a:hover {
+	background-color: #999;
+	color: #eee;
+}
+
+#fedora-footer {
+	font-size: 0.75em;
+	text-align: center;
+	color: #777;
+	margin-bottom: 2em;
+}
+#fedora-printable {
+	text-align: center;
+	margin: 1em 0;
+	font-size: 0.85em;
+}
+#fedora-printable a {
+	text-decoration: none;
+	padding: 5px 0;
+	padding-left: 18px;
+	background: transparent url("../images/printable.png") no-repeat left;
+}
+#fedora-printable a:hover {
+	text-decoration: underline;
+}
+
+
+.left {
+	margin: 10px;
+	padding: 0px;
+	float: left;
+}
+
+.right {
+	margin: 10px;
+	padding: 0px;
+	float: right;
+}
+
+
+.blosxomStory p {
+	margin-top: 7px;
+	margin-bottom: 7px;
+}
\ No newline at end of file
diff --git a/roles/planet/files/sub-planets/design/css/people-style.css b/roles/planet/files/sub-planets/design/css/people-style.css
new file mode 100644
index 0000000000..9f95fc7535
--- /dev/null
+++ b/roles/planet/files/sub-planets/design/css/people-style.css
@@ -0,0 +1,169 @@
+html, body {
+	border: 0;
+	padding: 0;
+	margin: 0;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	min-width: 912px;
+	background-color: #eeeff1;
+}
+#header {
+	margin-bottom: 23px; /* sync this value with margin-top of #content */
+	background: #2963a5 url("../images/people-header.png") repeat-y 20% 0%;
+	height: 74px;
+}
+#header .logo {
+	position: absolute;
+	display: block;
+	left: 5px;
+	top: 3px;
+}
+#content {
+	margin-top: -23px;  /* sync this value with margin-top of #content */
+	margin-right: 210px;
+	background-color: white;
+}
+.blog-entries-daily {
+	background: white url("../images/people-entry-group-date-header.png") no-repeat top right;
+	margin-right: 25px;
+	position: relative;
+	padding-bottom: 12px;
+	margin-bottom: 30px;
+}
+.blog-date {
+	text-align: center;
+	background: transparent url("../images/people-entry-group-date-background.png") repeat-y top right;
+	color: white;
+	margin-top: 11px;
+	position: absolute;
+	right: 0;
+	font-size: 0.9em;
+	width: 229px;
+	height: 100%;
+}
+.blog-entry {
+	clear: both;
+	margin: 11px 0;
+	position: relative;
+	top: 40px;
+}
+.blog-entry-author {
+	float: left;
+	margin-top: 30px;
+	padding: 0 20px 30px 0;
+	width: 125px;
+	font-size: 0.8em;
+	text-align: center;
+}
+.blog-entry-author :link, .blog-entry-author :visited {
+	font-size: 0.9em;
+}
+.blog-entry-author .head {
+	display: block;
+	margin: 1ex auto;
+	border: 0;
+}
+.blog-entry-post {
+	margin: 1em 0 1em 145px;
+	border-radius: 20px;
+	background: transparent url("../images/people-entry-center-left.png") repeat-y center left;
+}
+.blog-entry-header {
+	background: transparent url("../images/people-entry-top-center.png") repeat-x top center;
+	height: 50px;
+}
+.blog-entry-title {
+	font-size: larger;
+	background: transparent url("../images/people-entry-top-left.png") no-repeat top left;
+	height: 50px;
+}
+.blog-entry-title a {
+	padding: 1em 0;
+	display: block;
+	margin-left: 25px;
+	background: transparent url("../images/people-entry-top-right.png") no-repeat top right;
+	height: 50px;
+}
+.blog-entry-content {
+	padding-top:10px;
+	padding-right: 3em;
+	margin-left: 25px;
+	text-align: justify;
+	font-size: 0.8em;
+	font-weight: normal;
+	background: transparent url("../images/people-entry-center-right.png") repeat-y center right;
+	padding-bottom:10px;
+	position: relative;
+	overflow: auto;
+}
+.blog-entry-content img {
+	max-width: 575px;
+	margin-left: 2ex;
+}
+.blog-entry-footer {
+	background: transparent url("../images/people-entry-bottom-center.png") repeat-x bottom center;
+}
+.blog-entry-timestamp {
+	font-size: x-small;
+	text-align: right;
+	color: #b3b3b3;
+	background: transparent url("../images/people-entry-bottom-left.png") no-repeat bottom left;
+}
+.blog-entry-timestamp a {
+	display: block;
+	color: #b3b3b3;
+	text-decoration: none;
+	height: 35px;
+	background: transparent url("../images/people-entry-bottom-right.png") no-repeat bottom right;
+	padding: 1em 5em 0 0;
+}
+#disclaimer {
+	font-size: x-small;
+	color: #b3b3b3;
+	text-align: center;
+	padding: 1em;
+}
+#sidebar {
+	color: #555555;
+	background-color: #eeeff1;
+	font-size: 0.8em;
+	position: absolute;
+	width: 210px;
+	min-width: 210px;
+	max-width: 210px;
+	top: 0;
+	right: 0;
+	margin: 0;
+	border-left: 2px solid white;
+	height: 100%;
+}
+#sidebar #sidebar-header {
+	display: block;
+	background-color: #2963a5;
+}
+#sidebar-inner {
+	padding: 10px;
+}
+#sidebar h2 {
+	font-size: 1.4em;
+	font-weight: normal;
+	border-bottom: 1px solid #cfd4d9;
+	margin: 5px 0px;
+	padding: 0px 5px;
+}
+
+#sidebar ul {
+	list-style: square inside;
+	padding: 0;
+	margin: 0 0 1em 0;
+	color: #22538b;
+}
+#spacer {
+	height: 1em;
+}
+:link {
+	color: #337ACC;
+}
+:visited {
+	color: #6A3B18;
+}
+
diff --git a/roles/planet/files/sub-planets/design/css/print.css b/roles/planet/files/sub-planets/design/css/print.css
new file mode 100644
index 0000000000..0be9beab70
--- /dev/null
+++ b/roles/planet/files/sub-planets/design/css/print.css
@@ -0,0 +1,86 @@
+body {
+	background: white;
+	color: black;
+	font-size: 10pt;
+	font-family: sans-serif;
+	line-height: 1.25em;
+}
+
+div {
+	border: 1px solid white;
+}
+li {
+	border: 1px solid white;
+	margin: 0;
+}
+li p {
+	display: inline;
+}
+
+h1 {
+	font-size: 16pt;
+}
+h2 {
+	font-size: 12pt;
+}
+h3,h4,h5 {
+	font-size: 10pt;
+}
+img {
+	border: 1px solid white;
+	background-color: white;
+}
+hr {
+	border: 1px dotted gray;
+	border-width: 0 0 1 0;
+	margin: 1em;
+}
+table {
+	border-collapse: collapse;
+}
+td,th {
+	border: 1px solid gray;
+	padding: 8pt;
+	font-size: 10pt;
+}
+th {
+	font-weight: bold;
+}
+#fedora-header, #fedora-footer {
+	text-align: center;
+}
+#fedora-header-items, #fedora-side-left, #fedora-side-right {
+	display: none;
+}
+
+#fedora-project-download dt {
+	font-weight: bold;
+	margin-top: 8pt;
+	margin-left: 5pt;
+}
+#fedora-project-download dd {
+	padding: 0;
+	margin: 10px 20px 0;
+}
+
+code.screen, pre.screen {
+	font-family: monospace;
+	font-size: 1em;
+	display: block;
+	padding: 5pt;
+	border: 1px dashed gray;
+	margin: 0.5em 2em;
+}
+#fedora-project code.screen {
+	margin: 0;
+}
+
+/*
+#fedora-content a:link:after, #fedora-content a:visited:after {
+	content: " (" attr(href) ") ";
+	font-size: 80%;
+}
+*/
+.navheader table, .navheader table td {
+	border: 0 !important;
+}
diff --git a/roles/planet/files/sub-planets/design/fpbuilder.conf b/roles/planet/files/sub-planets/design/fpbuilder.conf
new file mode 100644
index 0000000000..7aa5a5653e
--- /dev/null
+++ b/roles/planet/files/sub-planets/design/fpbuilder.conf
@@ -0,0 +1,4 @@
+[main]
+base_config=/etc/planet/design/base_config
+output=/srv/planet/site/design/planet.ini
+group=design
diff --git a/roles/planet/files/sub-planets/design/images/blue.png b/roles/planet/files/sub-planets/design/images/blue.png
new file mode 100644
index 0000000000..6987cab624
Binary files /dev/null and b/roles/planet/files/sub-planets/design/images/blue.png differ
diff --git a/roles/planet/files/sub-planets/design/images/corner-bl.png b/roles/planet/files/sub-planets/design/images/corner-bl.png
new file mode 100644
index 0000000000..58d269c306
Binary files /dev/null and b/roles/planet/files/sub-planets/design/images/corner-bl.png differ
diff --git a/roles/planet/files/sub-planets/design/images/corner-br.png b/roles/planet/files/sub-planets/design/images/corner-br.png
new file mode 100644
index 0000000000..c03dd92bec
Binary files /dev/null and b/roles/planet/files/sub-planets/design/images/corner-br.png differ
diff --git a/roles/planet/files/sub-planets/design/images/corner-tl.png b/roles/planet/files/sub-planets/design/images/corner-tl.png
new file mode 100644
index 0000000000..08ab7a3ac2
Binary files /dev/null and b/roles/planet/files/sub-planets/design/images/corner-tl.png differ
diff --git a/roles/planet/files/sub-planets/design/images/corner-tr.png b/roles/planet/files/sub-planets/design/images/corner-tr.png
new file mode 100644
index 0000000000..b279db2961
Binary files /dev/null and b/roles/planet/files/sub-planets/design/images/corner-tr.png differ
diff --git a/roles/planet/files/sub-planets/design/images/favicon.ico b/roles/planet/files/sub-planets/design/images/favicon.ico
new file mode 100644
index 0000000000..d1ae2d209a
Binary files /dev/null and b/roles/planet/files/sub-planets/design/images/favicon.ico differ
diff --git a/roles/planet/files/sub-planets/design/images/header-download.png b/roles/planet/files/sub-planets/design/images/header-download.png
new file mode 100644
index 0000000000..a1cf3e577e
Binary files /dev/null and b/roles/planet/files/sub-planets/design/images/header-download.png differ
diff --git a/roles/planet/files/sub-planets/design/images/header-faq.png b/roles/planet/files/sub-planets/design/images/header-faq.png
new file mode 100644
index 0000000000..1e7c3c95d3
Binary files /dev/null and b/roles/planet/files/sub-planets/design/images/header-faq.png differ
diff --git a/roles/planet/files/sub-planets/design/images/header-fedora_logo.png b/roles/planet/files/sub-planets/design/images/header-fedora_logo.png
new file mode 100644
index 0000000000..552f201643
Binary files /dev/null and b/roles/planet/files/sub-planets/design/images/header-fedora_logo.png differ
diff --git a/roles/planet/files/sub-planets/design/images/header-projects.png b/roles/planet/files/sub-planets/design/images/header-projects.png
new file mode 100644
index 0000000000..aad307edd2
Binary files /dev/null and b/roles/planet/files/sub-planets/design/images/header-projects.png differ
diff --git a/roles/planet/files/sub-planets/design/images/heads/default.png b/roles/planet/files/sub-planets/design/images/heads/default.png
new file mode 100644
index 0000000000..407185b503
Binary files /dev/null and b/roles/planet/files/sub-planets/design/images/heads/default.png differ
diff --git a/roles/planet/files/sub-planets/design/images/intro-computer.png b/roles/planet/files/sub-planets/design/images/intro-computer.png
new file mode 100644
index 0000000000..9298aecea3
Binary files /dev/null and b/roles/planet/files/sub-planets/design/images/intro-computer.png differ
diff --git a/roles/planet/files/sub-planets/design/images/intro-download.png b/roles/planet/files/sub-planets/design/images/intro-download.png
new file mode 100644
index 0000000000..c77db0be2d
Binary files /dev/null and b/roles/planet/files/sub-planets/design/images/intro-download.png differ
diff --git a/roles/planet/files/sub-planets/design/images/logo-spacer.png b/roles/planet/files/sub-planets/design/images/logo-spacer.png
new file mode 100644
index 0000000000..a104f5535f
Binary files /dev/null and b/roles/planet/files/sub-planets/design/images/logo-spacer.png differ
diff --git a/roles/planet/files/sub-planets/design/images/logo.png b/roles/planet/files/sub-planets/design/images/logo.png
new file mode 100644
index 0000000000..f277bf9281
Binary files /dev/null and b/roles/planet/files/sub-planets/design/images/logo.png differ
diff --git a/roles/planet/files/sub-planets/design/images/mainBack.png b/roles/planet/files/sub-planets/design/images/mainBack.png
new file mode 100644
index 0000000000..1372780be6
Binary files /dev/null and b/roles/planet/files/sub-planets/design/images/mainBack.png differ
diff --git a/roles/planet/files/sub-planets/design/images/people-entry-bottom-center.png b/roles/planet/files/sub-planets/design/images/people-entry-bottom-center.png
new file mode 100644
index 0000000000..8d8ee6ace4
Binary files /dev/null and b/roles/planet/files/sub-planets/design/images/people-entry-bottom-center.png differ
diff --git a/roles/planet/files/sub-planets/design/images/people-entry-bottom-left.png b/roles/planet/files/sub-planets/design/images/people-entry-bottom-left.png
new file mode 100644
index 0000000000..1aadc48c53
Binary files /dev/null and b/roles/planet/files/sub-planets/design/images/people-entry-bottom-left.png differ
diff --git a/roles/planet/files/sub-planets/design/images/people-entry-bottom-right.png b/roles/planet/files/sub-planets/design/images/people-entry-bottom-right.png
new file mode 100644
index 0000000000..047c9081f9
Binary files /dev/null and b/roles/planet/files/sub-planets/design/images/people-entry-bottom-right.png differ
diff --git a/roles/planet/files/sub-planets/design/images/people-entry-center-left.png b/roles/planet/files/sub-planets/design/images/people-entry-center-left.png
new file mode 100644
index 0000000000..9da8d17866
Binary files /dev/null and b/roles/planet/files/sub-planets/design/images/people-entry-center-left.png differ
diff --git a/roles/planet/files/sub-planets/design/images/people-entry-center-right.png b/roles/planet/files/sub-planets/design/images/people-entry-center-right.png
new file mode 100644
index 0000000000..379c8c0671
Binary files /dev/null and b/roles/planet/files/sub-planets/design/images/people-entry-center-right.png differ
diff --git a/roles/planet/files/sub-planets/design/images/people-entry-group-date-background.png b/roles/planet/files/sub-planets/design/images/people-entry-group-date-background.png
new file mode 100644
index 0000000000..f029a675a4
Binary files /dev/null and b/roles/planet/files/sub-planets/design/images/people-entry-group-date-background.png differ
diff --git a/roles/planet/files/sub-planets/design/images/people-entry-group-date-header.png b/roles/planet/files/sub-planets/design/images/people-entry-group-date-header.png
new file mode 100644
index 0000000000..47ee607a41
Binary files /dev/null and b/roles/planet/files/sub-planets/design/images/people-entry-group-date-header.png differ
diff --git a/roles/planet/files/sub-planets/design/images/people-entry-top-center.png b/roles/planet/files/sub-planets/design/images/people-entry-top-center.png
new file mode 100644
index 0000000000..6b3b33aebf
Binary files /dev/null and b/roles/planet/files/sub-planets/design/images/people-entry-top-center.png differ
diff --git a/roles/planet/files/sub-planets/design/images/people-entry-top-left.png b/roles/planet/files/sub-planets/design/images/people-entry-top-left.png
new file mode 100644
index 0000000000..007a1e2850
Binary files /dev/null and b/roles/planet/files/sub-planets/design/images/people-entry-top-left.png differ
diff --git a/roles/planet/files/sub-planets/design/images/people-entry-top-right.png b/roles/planet/files/sub-planets/design/images/people-entry-top-right.png
new file mode 100644
index 0000000000..bfb41fb2a2
Binary files /dev/null and b/roles/planet/files/sub-planets/design/images/people-entry-top-right.png differ
diff --git a/roles/planet/files/sub-planets/design/images/people-header.png b/roles/planet/files/sub-planets/design/images/people-header.png
new file mode 100644
index 0000000000..d1fcbbc3c1
Binary files /dev/null and b/roles/planet/files/sub-planets/design/images/people-header.png differ
diff --git a/roles/planet/files/sub-planets/design/images/people-logo.png b/roles/planet/files/sub-planets/design/images/people-logo.png
new file mode 100644
index 0000000000..6404e088f1
Binary files /dev/null and b/roles/planet/files/sub-planets/design/images/people-logo.png differ
diff --git a/roles/planet/files/sub-planets/design/images/people-logo.png.bak b/roles/planet/files/sub-planets/design/images/people-logo.png.bak
new file mode 100644
index 0000000000..1543ebe181
Binary files /dev/null and b/roles/planet/files/sub-planets/design/images/people-logo.png.bak differ
diff --git a/roles/planet/files/sub-planets/design/images/people-sidebar-header.png b/roles/planet/files/sub-planets/design/images/people-sidebar-header.png
new file mode 100644
index 0000000000..c82025672e
Binary files /dev/null and b/roles/planet/files/sub-planets/design/images/people-sidebar-header.png differ
diff --git a/roles/planet/files/sub-planets/design/images/planet.png b/roles/planet/files/sub-planets/design/images/planet.png
new file mode 100644
index 0000000000..9606a0c30d
Binary files /dev/null and b/roles/planet/files/sub-planets/design/images/planet.png differ
diff --git a/roles/planet/files/sub-planets/design/planet-group.cron b/roles/planet/files/sub-planets/design/planet-group.cron
new file mode 100644
index 0000000000..6dca66123b
--- /dev/null
+++ b/roles/planet/files/sub-planets/design/planet-group.cron
@@ -0,0 +1,2 @@
+*/20 * * * * planet-user bash /usr/local/bin/pull-run-planet-config.sh /etc/planet/design/fpbuilder.conf >>/dev/null 2>&1
+10 4 * * * *  planet-user /usr/sbin/tmpwatch 360 /srv/planet/config/design/cache >>/dev/null
\ No newline at end of file
diff --git a/roles/planet/files/sub-planets/design/templates/atom.xml.tmpl b/roles/planet/files/sub-planets/design/templates/atom.xml.tmpl
new file mode 100644
index 0000000000..04aa46b373
--- /dev/null
+++ b/roles/planet/files/sub-planets/design/templates/atom.xml.tmpl
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+
+	<title><TMPL_VAR name></title>
+	<link rel="self" href="<TMPL_VAR feed ESCAPE="HTML">"/>
+	<link href="<TMPL_VAR link ESCAPE="HTML">"/>
+	<id><TMPL_VAR feed ESCAPE="HTML"></id>
+	<updated><TMPL_VAR date_iso></updated>
+	<generator uri="http://planet.fedoraproject.org/"><TMPL_VAR generator ESCAPE="HTML"></generator>
+
+<TMPL_LOOP Items>
+	<entry<TMPL_IF channel_language> xml:lang="<TMPL_VAR channel_language>"</TMPL_IF>>
+		<title type="html"<TMPL_IF title_language> xml:lang="<TMPL_VAR title_language>"</TMPL_IF>><TMPL_VAR title ESCAPE="HTML"></title>
+		<link href="<TMPL_VAR link ESCAPE="HTML">"/>
+		<id><TMPL_VAR id ESCAPE="HTML"></id>
+		<updated><TMPL_VAR date_iso></updated>
+		<content type="html"<TMPL_IF content_language> xml:lang="<TMPL_VAR content_language>"</TMPL_IF>>
+                <TMPL_IF channel_face>
+			&lt;img src=&quot;<TMPL_VAR channel_face ESCAPE="HTML">&quot; <TMPL_IF channel_facewidth>width=&quot;<TMPL_VAR channel_facewidth>&quot; </TMPL_IF><TMPL_IF channel_faceheight>height=&quot;<TMPL_VAR channel_faceheight>&quot; </TMPL_IF> alt=&quot;&quot; style=&quot;float: right;&quot;&gt;
+		</TMPL_IF> <TMPL_VAR content ESCAPE="HTML"></content>
+		<author>
+<TMPL_IF author_name>
+			<name><TMPL_VAR author_name ESCAPE="HTML"></name>
+<TMPL_IF author_email>
+			<email><TMPL_VAR author_email ESCAPE="HTML"></email>
+</TMPL_IF author_email>
+<TMPL_ELSE>
+<TMPL_IF channel_author_name>
+			<name><TMPL_VAR channel_author_name ESCAPE="HTML"></name>
+<TMPL_IF channel_author_email>
+			<email><TMPL_VAR channel_author_email ESCAPE="HTML"></email>
+</TMPL_IF channel_author_email>
+<TMPL_ELSE>
+			<name><TMPL_VAR channel_name ESCAPE="HTML"></name>
+</TMPL_IF>
+</TMPL_IF>
+			<uri><TMPL_VAR channel_link ESCAPE="HTML"></uri>
+		</author>
+		<source>
+<TMPL_IF channel_title>
+			<title type="html"><TMPL_VAR channel_title ESCAPE="HTML"></title>
+<TMPL_ELSE>
+			<title type="html"><TMPL_VAR channel_name ESCAPE="HTML"></title>
+</TMPL_IF>
+<TMPL_IF channel_subtitle>
+			<subtitle type="html"><TMPL_VAR channel_subtitle ESCAPE="HTML"></subtitle>
+</TMPL_IF>
+			<link rel="self" href="<TMPL_VAR channel_url ESCAPE="HTML">"/>
+<TMPL_IF channel_id>
+			<id><TMPL_VAR channel_id ESCAPE="HTML"></id>
+<TMPL_ELSE>
+			<id><TMPL_VAR channel_url ESCAPE="HTML"></id>
+</TMPL_IF>
+<TMPL_IF channel_updated_iso>
+			<updated><TMPL_VAR channel_updated_iso></updated>
+</TMPL_IF>
+<TMPL_IF channel_rights>
+			<rights type="html"><TMPL_VAR channel_rights ESCAPE="HTML"></rights>
+</TMPL_IF>
+		</source>
+	</entry>
+
+</TMPL_LOOP>
+</feed>
diff --git a/roles/planet/files/sub-planets/design/templates/foafroll.xml.tmpl b/roles/planet/files/sub-planets/design/templates/foafroll.xml.tmpl
new file mode 100644
index 0000000000..b2cecf3548
--- /dev/null
+++ b/roles/planet/files/sub-planets/design/templates/foafroll.xml.tmpl
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<rdf:RDF
+	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+	xmlns:foaf="http://xmlns.com/foaf/0.1/"
+	xmlns:rss="http://purl.org/rss/1.0/"
+	xmlns:dc="http://purl.org/dc/elements/1.1/"
+>
+<foaf:Group>
+	<foaf:name><TMPL_VAR name></foaf:name>
+	<foaf:homepage><TMPL_VAR link></foaf:homepage>
+	<rdfs:seeAlso rdf:resource="<TMPL_VAR uri ESCAPE="HTML">" />
+
+<TMPL_LOOP Channels>
+	<foaf:member>
+		<foaf:Agent>
+			<foaf:name><TMPL_VAR name></foaf:name>
+			<foaf:weblog>
+				<foaf:Document rdf:about="<TMPL_VAR link ESCAPE="HTML">">
+					<dc:title><TMPL_VAR title></dc:title>
+					<rdfs:seeAlso>
+						<rss:channel rdf:about="<TMPL_VAR uri ESCAPE="HTML">" />
+					</rdfs:seeAlso>
+				</foaf:Document>
+			</foaf:weblog>
+		</foaf:Agent>
+	</foaf:member>
+</TMPL_LOOP>
+
+</foaf:Group>
+</rdf:RDF>
diff --git a/roles/planet/files/sub-planets/design/templates/heads.html.tmpl b/roles/planet/files/sub-planets/design/templates/heads.html.tmpl
new file mode 100644
index 0000000000..c4e96f2b24
--- /dev/null
+++ b/roles/planet/files/sub-planets/design/templates/heads.html.tmpl
@@ -0,0 +1,111 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<title>Planet Fedora</title>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8">
+    <meta http-equiv="Content-Type" content="text/html">
+    <meta name="MSSmartTagsPreventParsing" content="TRUE">
+    <link rel="stylesheet" type="text/css" media="print" href="http://planet.fedoraproject.org/css/print.css">
+    <link rel="stylesheet" type="text/css" media="all" href="http://fedoraproject.org/static/css/fedora.css">
+    <link rel="stylesheet" type="text/css" media="all" href="/css/fedora_planet.css">
+    <link rel="shortcut icon" href="/images/favicon.ico">
+    <link rel="icon" href="/images/favicon.ico">
+    <link rel="alternate" type="application/xml" title="RSS" href="http://planet.fedoraproject.org/rss20.xml">
+    <link rel="alternate" type="application/atom+xml" title="Fedora People Atom 1.0" href="http://planet.fedoraproject.org/atom.xml">
+    <style type="text/css">
+        #content ul {
+            overflow: auto;
+            list-style: none;
+        }
+        #content ul li {
+            height: 160px;
+            float: left;
+            text-align: center;
+            margin: 1em;
+        }
+        #content ul li img {
+            display: block;
+            margin: 0 auto;
+        }
+    </style>
+</head>
+<body class="home">
+    <div id="wrapper">
+
+        <div id="head">
+            <h1><a href="http://fedoraproject.org/">Fedora</a></h1>
+        </div>
+
+        <div id="sidebar">
+            <div id="planet_nav">
+
+                <h2>Feeds</h2>
+                <a href="rss10.xml">RSS 1.0</a><br>
+                <a href="rss20.xml">RSS 2.0</a><br>
+                <a href="atom.xml">Atom 1.0</a><br>
+                <a href="foafroll.xml">FOAF blogroll</a><br>
+
+                <h2>Links</h2>
+                <ul>
+                    <li><a href="http://fedoraproject.org">Fedora Home</a></li>
+                    <li><a href="http://fedoranews.org">Fedora News</a></li>
+                    <li><a href="http://planet.fedoraproject.org/heads/">Hackergotchi Heads</a></li>
+                    <li><a href="http://fedoraproject.org/infofeed/">Fedora Info</a></li>
+                </ul>
+
+                <h2>Other Aggregates</h2>
+                <ul>
+                    <li><a href="http://advogato.org/recentlog.html?thresh=4">Advogato</a> <a href="http://advogato.org/">(main)</a></li>
+                    <li><a href="http://planet.apache.org/">Planet Apache</a></li>
+                    <li><a href="http://planet.debian.net/">Planet Debian</a></li>
+
+                    <li><a href="http://planet.gnome.org/">Planet Gnome</a></li>
+                    <li><a href="http://www.kdedevelopers.org/blog">KDE Developers</a></li>
+                    <li><a href="http://planet.freedesktop.org">Freedesktop.org</a></li>
+                    <li><a href="http://www.planetmysql.org/">Planet MySQL</a></li>
+                </ul>
+
+                <h2>People</h2>
+                <ul id="people_feeds">
+
+                <TMPL_LOOP Channels>
+                    <li><a href="<TMPL_VAR url ESCAPE="HTML">"><img src="/images/rss.png" alt="RSS"></a><a href="<TMPL_VAR link>" title="<TMPL_VAR title>"><TMPL_VAR name></a></li>
+                </TMPL_LOOP>
+                </ul>
+
+                <h2>Add your blog</h2>
+                <ul><li><a href="http://fedoraproject.org/wiki/Planet_HowTo">Add your blog</a></li></ul>
+		<ul><li><div class="fedora_planet">"The content on this page is provided by Fedora contributors, and represents their individual viewpoints, and not necessarily those of the Fedora Project or any of its sponsors or other members."</div></a></li></ul>
+            </div>
+        </div>
+
+
+        <div id="content">
+            <div class="spacer">
+            </div> <!-- :-} -->
+<ul>
+<TMPL_LOOP Channels>
+<!--<li class="head"><TMPL_IF link><a href="<TMPL_VAR link>" title="<TMPL_VAR title>"></TMPL_IF><img src="<TMPL_VAR face ESCAPE="HTML">" <TMPL_IF facewidth>width="<TMPL_VAR facewidth>" </TMPL_IF><TMPL_IF faceheight>height="<TMPL_VAR faceheight>" </TMPL_IF>alt="" /><TMPL_VAR name><TMPL_IF link></a></TMPL_IF></li>-->
+<li class="head"><TMPL_IF link><a href="<TMPL_VAR link ESCAPE="HTML">" title="<TMPL_VAR title>"></TMPL_IF><img src="<TMPL_VAR face ESCAPE="HTML">" /><TMPL_VAR name><TMPL_IF link></a></TMPL_IF></li>
+</TMPL_LOOP>
+</ul>
+
+    </div>
+</div>
+    <div id="bottom">
+        <div id="footer">
+            <p class="copy">&copy; 2010 Red Hat, Inc. and others.  Please send any comments or corrections to the <a href="mailto:webmaster@fedoraproject.org">websites team</a>.</p>
+            <p class="disclaimer">The Fedora Project is maintained and driven by the community and sponsored by Red Hat.  This is a community maintained site.  Red Hat is not responsible for content.</p>
+            <p class="disclaimer">Your words are your own, duh. Nothing here represents Fedora™, Red Hat, Inc, or pretty much anything else. If you think it does then you are badly misled</p>
+            <ul>
+                <li class="first"><a href="/en/sponsors">Sponsors</a></li>
+                <li><a href="http://fedoraproject.org/wiki/Legal">Legal</a></li>
+                <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a></li>
+            </ul>
+        </div>
+    </div>
+
+
+</body>
+</html>
diff --git a/roles/planet/files/sub-planets/design/templates/index.html.tmpl b/roles/planet/files/sub-planets/design/templates/index.html.tmpl
new file mode 100644
index 0000000000..a8548f10ca
--- /dev/null
+++ b/roles/planet/files/sub-planets/design/templates/index.html.tmpl
@@ -0,0 +1,125 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<title>Planet Fedora</title>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8">
+    <meta http-equiv="Content-Type" content="text/html">
+    <meta name="MSSmartTagsPreventParsing" content="TRUE">
+    <link rel="stylesheet" type="text/css" media="print" href="http://planet.fedoraproject.org/css/print.css">
+    <link rel="stylesheet" type="text/css" media="all" href="http://fedoraproject.org/static/css/fedora.css">
+    <link rel="stylesheet" type="text/css" media="all" href="/css/fedora_planet.css">
+    <link rel="shortcut icon" href="/images/favicon.ico">
+    <link rel="icon" href="/images/favicon.ico">
+    <link rel="alternate" type="application/xml" title="RSS" href="http://planet.fedoraproject.org/rss20.xml">
+    <link rel="alternate" type="application/atom+xml" title="Fedora People Atom 1.0" href="http://planet.fedoraproject.org/atom.xml">
+</head>
+<body class="home">
+    <div id="wrapper">
+
+        <div id="head">
+            <h1><a href="http://fedoraproject.org/">Fedora</a></h1>
+        </div>
+
+        <div id="sidebar">
+            <div id="planet_nav">
+
+                <h2>Feeds</h2>
+                <a href="rss10.xml">RSS 1.0</a><br>
+                <a href="rss20.xml">RSS 2.0</a><br>
+                <a href="atom.xml">Atom 1.0</a><br>
+                <a href="foafroll.xml">FOAF blogroll</a><br>
+
+                <h2>Links</h2>
+                <ul>
+                    <li><a href="http://fedoraproject.org">Fedora Home</a></li>
+                    <li><a href="http://fedoranews.org">Fedora News</a></li>
+                    <li><a href="http://planet.fedoraproject.org/heads/">Hackergotchi Heads</a></li>
+                    <li><a href="http://fedoraproject.org/infofeed/">Fedora Info</a></li>
+                </ul>
+
+                <h2>Other Aggregates</h2>
+                <ul>
+                    <li><a href="http://advogato.org/recentlog.html?thresh=4">Advogato</a> <a href="http://advogato.org/">(main)</a></li>
+                    <li><a href="http://planet.apache.org/">Planet Apache</a></li>
+                    <li><a href="http://planet.debian.net/">Planet Debian</a></li>
+
+                    <li><a href="http://planet.gnome.org/">Planet Gnome</a></li>
+                    <li><a href="http://www.kdedevelopers.org/blog">KDE Developers</a></li>
+                    <li><a href="http://planet.freedesktop.org">Freedesktop.org</a></li>
+                    <li><a href="http://www.planetmysql.org/">Planet MySQL</a></li>
+                </ul>
+
+                <h2>People</h2>
+                <ul id="people_feeds">
+
+                <TMPL_LOOP Channels>
+                    <li><a href="<TMPL_VAR url ESCAPE="HTML">"><img src="images/rss.png" alt="RSS"></a><a href="<TMPL_VAR link ESCAPE="HTML">" title="<TMPL_VAR title ESCAPE="HTML">"><TMPL_VAR name ESCAPE="HTML"></a></li>
+                </TMPL_LOOP>
+                </ul>
+
+                <h2>Add your blog</h2>
+                <ul><li><a href="http://fedoraproject.org/wiki/Planet_HowTo">Add your blog</a></li></ul>
+		<ul><li><div class="fedora_planet">"The content on this page is provided by Fedora contributors, and represents their individual viewpoints, and not necessarily those of the Fedora Project or any of its sponsors or other members."</div></a></li></ul>
+            </div>
+        </div>
+
+
+        <div id="content">
+            <div class="spacer">
+        <TMPL_LOOP Items>
+
+            <TMPL_IF new_date>
+            </div> <!-- :-} -->
+
+            <div class="blog-entries-daily">
+            <h2 class="blog-date"><TMPL_VAR new_date></h2>
+            </TMPL_IF>
+
+
+            <div class="blog-entry <TMPL_VAR channel_name>">
+                <div class="blog-entry-post">
+                    <div class="blog-entry-header">
+                        <div class="blog-entry-author">
+
+                            <TMPL_IF channel_face>
+                                <img src="<TMPL_VAR channel_face ESCAPE="HTML">" <TMPL_IF channel_facewidth>width="<TMPL_VAR channel_facewidth>" </TMPL_IF><TMPL_IF channel_faceheight>height="<TMPL_VAR channel_faceheight>" </TMPL_IF>alt="">
+                                <br><a href="<TMPL_VAR channel_link ESCAPE="HTML">"><TMPL_VAR channel_name></a>
+
+                            </TMPL_IF>
+
+                        </div>
+
+                        <div class="blog-entry-title"><a href="<TMPL_VAR link>"><TMPL_IF title><TMPL_VAR title><TMPL_ELSE>Untitled Post</TMPL_IF></a></div>
+                    </div>
+
+                    <div class="blog-entry-content-container">
+
+                        <div class="blog-entry-content"><TMPL_VAR content></div>
+
+                    </div>
+                    <div class="blog-entry-footer">
+                    <div class="blog-entry-timestamp"><a href="<TMPL_VAR link ESCAPE="HTML">"><TMPL_IF creator>by <TMPL_VAR creator> at </TMPL_IF><TMPL_VAR date></a></div>
+                    </div>
+                </div>
+            </div>
+    </TMPL_LOOP>
+        </div>
+    </div>
+</div>
+    <div id="bottom">
+        <div id="footer">
+            <p class="copy">&copy; 2010 Red Hat, Inc. and others.  Please send any comments or corrections to the <a href="mailto:webmaster@fedoraproject.org">websites team</a>.</p>
+            <p class="disclaimer">The Fedora Project is maintained and driven by the community and sponsored by Red Hat.  This is a community maintained site.  Red Hat is not responsible for content.</p>
+            <p class="disclaimer">Your words are your own, duh. Nothing here represents Fedora™, Red Hat, Inc, or pretty much anything else. If you think it does then you are badly misled</p>
+            <ul>
+                <li class="first"><a href="/en/sponsors">Sponsors</a></li>
+                <li><a href="http://fedoraproject.org/wiki/Legal">Legal</a></li>
+                <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a></li>
+            </ul>
+        </div>
+    </div>
+
+
+</body>
+</html>
diff --git a/roles/planet/files/sub-planets/design/templates/opml.xml.tmpl b/roles/planet/files/sub-planets/design/templates/opml.xml.tmpl
new file mode 100644
index 0000000000..aaa8833810
--- /dev/null
+++ b/roles/planet/files/sub-planets/design/templates/opml.xml.tmpl
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<opml version="1.1">
+	<head>
+		<title><TMPL_VAR name></title>
+		<dateCreated><TMPL_VAR date_822></dateCreated>
+		<dateModified><TMPL_VAR date_822></dateModified>
+		<ownerName><TMPL_VAR owner_name></ownerName>
+		<ownerEmail><TMPL_VAR owner_email></ownerEmail>
+	</head>
+	
+	<body>
+		<TMPL_LOOP Channels>
+		<outline text="<TMPL_VAR name ESCAPE="HTML">" xmlUrl="<TMPL_VAR url ESCAPE="HTML">"/>
+		</TMPL_LOOP>
+	</body>
+</opml>
diff --git a/roles/planet/files/sub-planets/design/templates/rss10.xml.tmpl b/roles/planet/files/sub-planets/design/templates/rss10.xml.tmpl
new file mode 100644
index 0000000000..2bf19195c3
--- /dev/null
+++ b/roles/planet/files/sub-planets/design/templates/rss10.xml.tmpl
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<rdf:RDF
+	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	xmlns:dc="http://purl.org/dc/elements/1.1/"
+	xmlns:foaf="http://xmlns.com/foaf/0.1/"
+	xmlns:content="http://purl.org/rss/1.0/modules/content/"
+	xmlns="http://purl.org/rss/1.0/"
+>
+<channel rdf:about="<TMPL_VAR link ESCAPE="HTML">">
+	<title><TMPL_VAR name></title>
+    <link><TMPL_VAR link ESCAPE="HTML"></link>
+        <description>Fedora People: http://planet.fedoraproject.org</description>
+	<items>
+		<rdf:Seq>
+<TMPL_LOOP Items>
+			<rdf:li rdf:resource="<TMPL_VAR id ESCAPE="HTML">" />
+</TMPL_LOOP>
+		</rdf:Seq>
+	</items>
+</channel>
+
+<TMPL_LOOP Items>
+<item rdf:about="<TMPL_VAR id ESCAPE="HTML">">
+	<title><TMPL_VAR channel_name><TMPL_IF title>: <TMPL_VAR title></TMPL_IF></title>
+    <link><TMPL_VAR link ESCAPE="HTML"></link>
+	<TMPL_IF content>
+	<content:encoded><TMPL_VAR content ESCAPE="HTML"></content:encoded>
+	</TMPL_IF>
+	<dc:date><TMPL_VAR date_iso></dc:date>
+</item>
+</TMPL_LOOP>
+
+</rdf:RDF>
diff --git a/roles/planet/files/sub-planets/design/templates/rss20.xml.tmpl b/roles/planet/files/sub-planets/design/templates/rss20.xml.tmpl
new file mode 100644
index 0000000000..882b341fc4
--- /dev/null
+++ b/roles/planet/files/sub-planets/design/templates/rss20.xml.tmpl
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
+<channel>
+   <atom:link href="http://planet.fedoraproject.org/rss20.xml" rel="self" type="application/rss+xml" />
+	<title><TMPL_VAR name></title>
+	<link><TMPL_VAR link></link>
+	<language>en</language>
+        <description>Fedora People: http://planet.fedoraproject.org</description>
+
+<TMPL_LOOP Items>
+<item>
+	<title><TMPL_VAR channel_name><TMPL_IF title>: <TMPL_VAR title></TMPL_IF></title>
+	<guid isPermaLink="false"><TMPL_VAR id ESCAPE="HTML"></guid>
+	<link><TMPL_VAR link ESCAPE="HTML"></link>
+	<TMPL_IF content>
+
+	<description>
+		<TMPL_IF channel_face>
+			&lt;img src=&quot;<TMPL_VAR channel_face ESCAPE="HTML">&quot; <TMPL_IF channel_facewidth>width=&quot;<TMPL_VAR channel_facewidth>&quot; </TMPL_IF><TMPL_IF channel_faceheight>height=&quot;<TMPL_VAR channel_faceheight>&quot; </TMPL_IF> alt=&quot;&quot; style=&quot;float: right;&quot;&gt;
+		</TMPL_IF>
+		<TMPL_VAR content ESCAPE="HTML"></description>
+	</TMPL_IF>
+	<pubDate><TMPL_VAR date_822></pubDate>
+</item>
+</TMPL_LOOP>
+
+</channel>
+</rss>
diff --git a/roles/planet/files/sub-planets/desktop/base_config b/roles/planet/files/sub-planets/desktop/base_config
new file mode 100644
index 0000000000..129f7dbfde
--- /dev/null
+++ b/roles/planet/files/sub-planets/desktop/base_config
@@ -0,0 +1,26 @@
+[Planet]
+name = Fedora desktop Planet
+link = http://planet.fedoraproject.org/desktop/
+owner_name = Fedora Admin
+owner_email = admin@fedoraproject.org
+cache_directory = /srv/planet/config/desktop/cache
+template_files = /srv/planet/config/desktop/templates/index.html.tmpl /srv/planet/config/desktop/templates/rss20.xml.tmpl /srv/planet/config/desktop/templates/rss10.xml.tmpl /srv/planet/config/desktop/templates/opml.xml.tmpl /srv/planet/config/desktop/templates/foafroll.xml.tmpl /srv/planet/config/desktop/templates/atom.xml.tmpl /srv/planet/config/desktop/templates/heads.html.tmpl 
+output_dir = /srv/planet/site/desktop
+items_per_page = 50
+log_level = ERROR
+date_format = %B %d, %Y %I:%M %p
+spider_threads=20
+#
+#     [DEFAULT]
+#     facewidth = 64
+#     faceheight = 64
+#
+#     [http://www.blog.com/rss]
+#     face = foo.png
+#     faceheight = 32
+#
+# The facewidth of the defined blog defaults to 64.
+
+[DEFAULT]
+face = http://planet.fedoraproject.org/desktop/images/heads/default.png
+
diff --git a/roles/planet/files/sub-planets/desktop/css/content.css b/roles/planet/files/sub-planets/desktop/css/content.css
new file mode 100644
index 0000000000..982924ee61
--- /dev/null
+++ b/roles/planet/files/sub-planets/desktop/css/content.css
@@ -0,0 +1,237 @@
+.name-project, .name-release, .name-version {
+}
+
+/* Front page H1 */
+#page-main h1 {
+	font-size: 1.35em;
+}
+
+#page-main h1.center {
+	text-align: center;
+}
+
+h1, h2, h3, h4 {
+	/*
+	font-style: italic;
+	*/
+	font-family: luxi sans,sans-serif;
+}
+h1 {
+	font-size: 1.75em;
+}
+
+h2 {
+	font-size: 1.25em;
+#	background-color: #eee;
+}
+
+h3 {
+	font-size: 1.1em;
+}
+
+hr {
+	border: 0;
+	border-bottom: 1px solid #ccc;
+}
+
+.fedora-side-right-content {
+	padding: 1 5px 1.5em;
+	font-size: 1em;
+}
+#fedora-side-right h1, #fedora-side-right h2, #fedora-side-right h3 {
+	margin: 0;
+	padding: 0 4pt 0;
+	font-size: 1em;
+	letter-spacing: 2pt;
+	border-bottom: 1px solid #bbb;
+}
+#fedora-side-right hr {
+	border-bottom: 1px solid #aaa;
+	margin: 0.5em 0;
+}
+
+table tr {
+	font-size: 0.9em; 
+}
+
+
+#link-offsite {
+}
+.link-offsite-notation {
+	font-size: 0.9em;
+	color: #777;
+	padding-left: 1pt;
+	text-decoration: none !important;
+}
+#fedora-content .link-offsite-notation {
+	color: #999;
+}
+#link-redhat {
+}
+#fedora-content #link-redhat {
+}
+#link-internal {
+}
+
+#fedora-content li {
+	padding: 1pt;
+}
+#fedora-content h1 {
+	margin-top: 0;
+}
+
+#fedora-content a img {
+	margin: 1px;
+	border: 0;
+}
+#fedora-content a:hover img {
+	margin: 0;
+	border: 1px solid #f00;
+}
+#fedora-content a img.noborder {
+	margin: 0;
+	border: 0;
+}
+#fedora-content a:hover img .noborder {
+	margin: 0;
+	border: 0;
+}
+
+#fedora-project-maintainers p, #fedora-project-contributors p, #fedora-project-bugs p {
+	margin-left: 5pt;
+}
+
+#fedora-project-download dt {
+	font-weight: bold;
+	margin-top: 8pt;
+	margin-left: 5pt;
+}
+#fedora-project-download dd {
+	padding: 0;
+	margin: 10px 20px 0;
+}
+#fedora-project-screenshots a img {
+	margin: 5px;
+}
+#fedora-project-screenshots a:hover img {
+	margin: 4px;
+}
+#fedora-project-todo ul {
+	border: 1px solid #cad4e9;
+	margin: 0 1em;
+	padding: 0;
+	list-style: none;
+	border-radius: 2.5px;
+	-moz-border-radius: 2.5px;
+}
+#fedora-project-todo li {
+	margin: 0;
+	padding: 6px 8px;
+}
+#fedora-project-todo li.odd {
+	background-color: #ecf0f7;
+}
+#fedora-project-todo li.even {
+	background-color: #f7f9fc;
+}
+
+#fedora-list-packages {
+	border-collapse: collapse;
+	border: 1px solid #cad4e9;
+	border-radius: 2.5px;
+	-moz-border-radius: 2.5px;
+}
+#fedora-list-packages tr.odd td {
+	background-color: #ecf0f7;
+}
+#fedora-list-packages tr.even td {
+	background-color: #f7f9fc;
+}
+#fedora-list-packages th,
+#fedora-list-packages td {
+	margin: 0;
+	padding: 6px 8px;
+}
+#fedora-list-packages td.column-2 {
+	text-align: center;
+}
+#fedora-list-packages th {
+	background-color: #cad4e9;
+	color: #000;
+	font-weight: bold;
+	text-align: center;
+
+}
+
+/* pre.screen is for DocBook HTML output */
+code.screen, pre.screen {
+	font-family: monospace;
+	font-size: 1em;
+	display: block;
+	padding: 10px;
+	border: 1px solid #bbb;
+	background-color: #eee;
+	color: #000;
+	overflow: auto;
+	border-radius: 2.5px;
+	-moz-border-radius: 2.5px;
+	margin: 0.5em 2em;
+}
+#fedora-project code.screen {
+	margin: 0;
+}
+
+code.command, code.filename {
+	font-family: monospace;
+}
+
+code.citetitle {
+	font-family: sans-serif;
+	font-style: italic;
+}
+
+strong.application {
+	font-weight: bold;
+}
+.indent {
+	margin: 0 2em;
+}
+.fedora-docs-nav {
+	text-align: center;
+	position: relative;
+	padding: 1em;
+	margin-top: 2em;
+	border-top: 1px solid #ccc;
+}
+.fedora-docs-nav a {
+	padding: 0 1em;
+}
+.fedora-docs-nav-left {
+	position: absolute;
+	left: 0;
+}
+.fedora-docs-nav-right {
+	position: absolute;
+	right: 0;
+}
+
+.fedoraEntry {
+
+padding-left: 10px;
+padding-right: 10px;
+padding-bottom: 10px;
+padding-top: 10px;
+border-bottom: 1px solid #ccc;
+}
+
+.fedoraStory {
+}
+
+.fedoraFace {
+	margin: 0 0 10px 10px;
+	float: right;
+}
+
+.fedoraTitle {
+	font-size: 1.25em;
+}
diff --git a/roles/planet/files/sub-planets/desktop/css/docbook.css b/roles/planet/files/sub-planets/desktop/css/docbook.css
new file mode 100644
index 0000000000..3181bce246
--- /dev/null
+++ b/roles/planet/files/sub-planets/desktop/css/docbook.css
@@ -0,0 +1,71 @@
+#fedora-content li p {
+	margin: 0.2em;
+}
+
+#fedora-content div.table table {
+	width: 95%;
+	background-color: #DCDCDC; 
+	color: #000000;
+	border-spacing: 0;
+}
+
+#fedora-content div.table table th {
+	border: 1px solid #A9A9A9;	
+	background-color: #A9A9A9;
+	color: #000000;
+}
+
+#fedora-content div.table table td {
+	border: 1px solid #A9A9A9; 
+	background-color: #DCDCDC;
+	color: #000000;
+	padding: 0.5em;
+	margin-bottom: 0.5em;
+	margin-top: 2px; 
+
+}
+
+div.note table, div.tip table, div.important table, div.caution table, div.warning table {
+	width: 95%;
+	border: 2px solid #B0C4DE;
+	background-color: #F0F8FF;
+	color: #000000;
+	/* padding inside table area */
+	padding: 0.5em;
+	margin-bottom: 0.5em;
+	margin-top: 0.5em;
+}
+
+/* "Just the FAQs, ma'm." */
+.qandaset table {
+	border-collapse: collapse;
+}
+.qandaset {
+}
+.qandaset tr.question {
+}
+.qandaset tr.question td {
+	font-weight: bold;
+	padding: 0 0.5em;
+	margin: 0;
+}
+.qandaset tr.answer td {
+	padding: 0 0.5em 1.5em;
+	margin: 0;
+}
+.qandaset tr.question td, .qandaset tr.answer td {
+	vertical-align: top;
+}
+.qandaset strong {
+	text-align: right;
+}
+
+.article .table table {
+	border: 0;
+	margin: 0 auto;
+	border-collapse: collapse;
+}
+.article .table table th {
+	padding: 5px;
+	text-align: center;
+}
diff --git a/roles/planet/files/sub-planets/desktop/css/layout.css b/roles/planet/files/sub-planets/desktop/css/layout.css
new file mode 100644
index 0000000000..6ceba83ce0
--- /dev/null
+++ b/roles/planet/files/sub-planets/desktop/css/layout.css
@@ -0,0 +1,362 @@
+	body {
+	font-size: 0.9em;
+	font-family: bitstream vera sans,sans-serif;
+	margin: 0;
+	padding: 0;
+	/* (The background color is specified elsewhere, so do a global replacement if it ever changes) */
+	background-color: #d9d9d9;
+}
+
+a:link {
+	color: #900;
+}
+a:visited {
+	color: #48468f;
+}
+a:hover {
+	color: #f20;
+}
+a[name] {
+	color: inherit;
+	text-decoration: inherit;
+}
+
+#fedora-header {
+	background-color: #fff;
+	height: 62px;
+}
+#fedora-header img {
+	border: 0;
+	vertical-align: middle;
+}
+#fedora-header-logo {
+	/* position is offset by the header padding amount */
+	position: absolute;
+	left: 26px;
+	top: 13px;
+	z-index: 3;
+}
+#fedora-header-logo img {
+	width: 110px;
+	height: 40;
+}
+#fedora-header-items {
+	/* position is offset by the header padding amount */
+	position: absolute;
+	right: 10px;
+	top: 15px;
+	text-align: right;
+	display: inline;
+}
+#fedora-header-items a {
+	color: #000;
+	text-decoration: none;
+	padding: 7pt;
+	font-size: 0.8em;
+}
+#fedora-header-items a:hover, #fedora-header-search-button:hover {
+	color: #f20;
+	cursor: pointer;
+}
+#fedora-header-items img {
+	margin-right: 1px;
+	width: 36px;
+	height: 36px;
+}
+#fedora-header-search {
+	height: 25px;
+}
+#fedora-header-search-entry {
+	vertical-align: top;
+	margin: 0.65em 4px 0 10px;
+	padding: 2px 4px;
+	background-color: #f5f5f5;
+	border: 1px solid #999;
+	font-size: 0.8em !important;
+}
+#fedora-header-search-entry:focus {
+	background-color: #fff;
+	border: 1px solid #555;
+}
+#fedora-header-search-button {
+	font-size: 0.8em !important;
+	vertical-align: top;
+	margin-top: 0.2em;
+	border: 0;
+	padding: 7px;
+	background: #fff url('../images/header-search.png') no-repeat left;
+	padding-left: 21px;
+}
+#fedora-header-items form {
+	float: right;
+}
+#fedora-header-items input {
+	font-size: 0.85em;
+}
+#fedora-nav {
+	margin: 0;
+	padding: 0;
+	background-color: #22437f;
+	font-size: 0;
+	height: 5px;
+	border-top: 1px solid #000;
+	border-bottom: 1px solid #f5f5f5;
+}
+#fedora-nav ul {
+	margin: 0;
+	padding: 0;
+}
+#fedora-nav li {
+	display: inline;
+	list-style: none;
+	padding: 0 5pt;
+}
+#fedora-nav li + li {
+	padding-left: 8pt;
+	border-left: 1px solid #99a5bf;
+}
+#fedora-nav a {
+	color: #c5ccdb;
+	text-decoration: none;
+}
+#fedora-nav a:hover {
+	color: #fff;
+}
+
+#fedora-side-left {
+	position: absolute;
+	z-index: 2;
+	width: 11em; 
+	/* Space down for the approx line height (fonts) */
+	left: 12px;
+}
+#fedora-side-right {
+	position: absolute;
+	z-index: 1;
+	width: 20em;
+	right: 12px;
+	padding-top: 3px;
+	}
+#fedora-side-left, #fedora-side-right {
+	top: 2px;
+	/* add to the top margin to compensate for the fixed sizes */
+	margin-top: 75px;
+	color: #555;
+	font-size: 0.9em;
+}
+#fedora-side-right ul {
+	list-style: square inside;
+	padding: 0;
+	margin: 0;
+}
+
+/* Left-side naviagation */
+#fedora-side-nav-label {
+	display: none;
+}
+#fedora-side-nav {
+	list-style: none;
+	margin: 0;
+	padding: 0;
+	border: 1px solid #5976b2;
+	border-top: 0;
+	background-color: #22437f;
+}
+#fedora-side-nav li {
+	margin: 0;
+	padding: 0;
+	border-top: 1px solid #5976b2;
+	/* IE/Win gets upset if there is no bottom border... Go figure. */
+	border-bottom: 1px solid #22437f;
+}
+#fedora-side-nav a {
+	margin: 0;
+	color: #c5ccdb;
+	display: block;
+	text-decoration: none;
+	padding: 4px 6px;
+}
+#fedora-side-nav a:hover {
+	background-color: #34548f;
+	color: #fff;
+}
+#fedora-side-nav ul {
+	list-style: none;
+	margin: 0;
+	padding: 0;
+}
+#fedora-side-nav ul li {
+	border-top: 1px solid #34548e;
+	background-color: #34548e;
+	/* IE/Win gets upset if there is no bottom border... Go figure. */
+	border-bottom: 1px solid #34548e;
+}
+#fedora-side-nav ul li:hover {
+	border-bottom: 1px solid #34548f;
+}
+#fedora-side-nav ul li a {
+	padding-left: 12px;
+	color: #a7b2c9;
+}
+#fedora-side-nav ul li a:hover {
+	background-color: #46659e;
+}
+#fedora-side-nav ul ul li a {
+	padding-left: 18px;
+}
+#fedora-side-nav strong a {
+	font-weight: normal;
+	color: #fff !important;
+	background-color: #10203b;
+}
+#fedora-side-nav strong a:hover {
+	background-color: #172e56 !important;
+}
+
+/* content containers */
+#fedora-middle-one, #fedora-middle-two, #fedora-middle-three {
+	font-size: 0.9em;
+	/* position: relative; */ /* relative to utilize z-index */
+	width: auto;
+	min-width: 120px;
+	margin: 10px;
+	z-index: 3; /* content can overlap when the browser is narrow */
+}
+/*
+#fedora-middle-two, #fedora-middle-three {
+	margin-left: 11em;
+	padding-left: 24px;
+}
+*/
+#fedora-middle-three {
+	margin-right: 20em;
+	padding-right: 24px;
+}
+
+#fedora-content {
+	padding: 24px;
+	border: 1px solid #aaa;
+	background-color: #fff;
+}
+
+#fedora-content > .fedora-corner-bottom { top: 0 }
+
+.fedora-corner-tl, .fedora-corner-tr, .fedora-corner-bl, .fedora-corner-br {
+	background-color: #d9d9d9;
+	position: relative;
+	width: 19px;
+	height: 19px;
+	/* The following line is to render PNGs with alpha transparency within IE/Win, using DirectX */
+	/* Work-around for IE6/Mac borkage (Part 1) */
+	display: none;
+}
+
+.fedora-corner-tl, .fedora-corner-bl { float: left; left: 0px; }
+.fedora-corner-tr, .fedora-corner-br { float: right; right: 0px; }
+.fedora-corner-tl, .fedora-corner-tr { top: 0px; }
+.fedora-corner-bl, .fedora-corner-br { bottom: 0px; margin-top: -19px; }
+
+
+html>body .fedora-corner-tl { background: #d9d9d9 url("../images/corner-tl.png") no-repeat left top; }
+html>body .fedora-corner-tr { background: #d9d9d9 url("../images/corner-tr.png") no-repeat right top; }
+html>body .fedora-corner-bl { background: #d9d9d9 url("../images/corner-bl.png") no-repeat left bottom; }
+html>body .fedora-corner-br { background: #d9d9d9 url("../images/corner-br.png") no-repeat right bottom; }
+
+.fedora-corner-tl { filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/corner-tl.png',sizingMethod='scale'); }
+.fedora-corner-tr { filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/corner-tr.png',sizingMethod='scale'); }
+.fedora-corner-br { filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/corner-br.png',sizingMethod='scale'); }
+.fedora-corner-bl { filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/corner-bl.png',sizingMethod='scale'); }
+
+/* \*/
+.fedora-corner-tl, .fedora-corner-tr, .fedora-corner-bl, .fedora-corner-br {
+	/* Restore the view for everything but IE6/Mac (part 2 of the "IE/Mac fix") */
+	display: block;
+}
+/* */
+
+html*.fedora-corner-bl, html*.fedora-corner-br {
+	/* Compensate for Opera's inability to position some things correctly (Part 2) */
+	top: 0px;
+}
+
+.content { margin: 0 1em }
+
+#fedora-sidelist {
+	position: relative;
+	bottom: 3px;
+	margin: 0;
+	padding: 3px !important;
+	border: 1px solid #bbb;
+	background-color: #ccc;
+	border-radius: 2.5px;
+	-moz-border-radius: 2.5px;
+}
+#fedora-sidelist strong a {
+	font-weight: normal;
+	background-color: #555;
+	color: #fff;
+}
+#fedora-sidelist strong a:hover {
+	background-color: #333;
+	color: #fff;
+}
+#fedora-sidelist li {
+	list-style-position: outside;
+	font-size: 0.9em;
+	list-style: none;
+	border: 1px solid #ccc;
+	border-width: 1px 0;
+	padding: 0;
+	list-style: none;
+}
+#fedora-sidelist li a {
+	text-decoration: none;
+	display: block;
+	padding: 6px 8px;
+	border-radius: 2.5px;
+	-moz-border-radius: 2.5px;
+}
+#fedora-sidelist li a:hover {
+	background-color: #999;
+	color: #eee;
+}
+
+#fedora-footer {
+	font-size: 0.75em;
+	text-align: center;
+	color: #777;
+	margin-bottom: 2em;
+}
+#fedora-printable {
+	text-align: center;
+	margin: 1em 0;
+	font-size: 0.85em;
+}
+#fedora-printable a {
+	text-decoration: none;
+	padding: 5px 0;
+	padding-left: 18px;
+	background: transparent url("../images/printable.png") no-repeat left;
+}
+#fedora-printable a:hover {
+	text-decoration: underline;
+}
+
+
+.left {
+	margin: 10px;
+	padding: 0px;
+	float: left;
+}
+
+.right {
+	margin: 10px;
+	padding: 0px;
+	float: right;
+}
+
+
+.blosxomStory p {
+	margin-top: 7px;
+	margin-bottom: 7px;
+}
\ No newline at end of file
diff --git a/roles/planet/files/sub-planets/desktop/css/people-style.css b/roles/planet/files/sub-planets/desktop/css/people-style.css
new file mode 100644
index 0000000000..9f95fc7535
--- /dev/null
+++ b/roles/planet/files/sub-planets/desktop/css/people-style.css
@@ -0,0 +1,169 @@
+html, body {
+	border: 0;
+	padding: 0;
+	margin: 0;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	min-width: 912px;
+	background-color: #eeeff1;
+}
+#header {
+	margin-bottom: 23px; /* sync this value with margin-top of #content */
+	background: #2963a5 url("../images/people-header.png") repeat-y 20% 0%;
+	height: 74px;
+}
+#header .logo {
+	position: absolute;
+	display: block;
+	left: 5px;
+	top: 3px;
+}
+#content {
+	margin-top: -23px;  /* sync this value with margin-top of #content */
+	margin-right: 210px;
+	background-color: white;
+}
+.blog-entries-daily {
+	background: white url("../images/people-entry-group-date-header.png") no-repeat top right;
+	margin-right: 25px;
+	position: relative;
+	padding-bottom: 12px;
+	margin-bottom: 30px;
+}
+.blog-date {
+	text-align: center;
+	background: transparent url("../images/people-entry-group-date-background.png") repeat-y top right;
+	color: white;
+	margin-top: 11px;
+	position: absolute;
+	right: 0;
+	font-size: 0.9em;
+	width: 229px;
+	height: 100%;
+}
+.blog-entry {
+	clear: both;
+	margin: 11px 0;
+	position: relative;
+	top: 40px;
+}
+.blog-entry-author {
+	float: left;
+	margin-top: 30px;
+	padding: 0 20px 30px 0;
+	width: 125px;
+	font-size: 0.8em;
+	text-align: center;
+}
+.blog-entry-author :link, .blog-entry-author :visited {
+	font-size: 0.9em;
+}
+.blog-entry-author .head {
+	display: block;
+	margin: 1ex auto;
+	border: 0;
+}
+.blog-entry-post {
+	margin: 1em 0 1em 145px;
+	border-radius: 20px;
+	background: transparent url("../images/people-entry-center-left.png") repeat-y center left;
+}
+.blog-entry-header {
+	background: transparent url("../images/people-entry-top-center.png") repeat-x top center;
+	height: 50px;
+}
+.blog-entry-title {
+	font-size: larger;
+	background: transparent url("../images/people-entry-top-left.png") no-repeat top left;
+	height: 50px;
+}
+.blog-entry-title a {
+	padding: 1em 0;
+	display: block;
+	margin-left: 25px;
+	background: transparent url("../images/people-entry-top-right.png") no-repeat top right;
+	height: 50px;
+}
+.blog-entry-content {
+	padding-top:10px;
+	padding-right: 3em;
+	margin-left: 25px;
+	text-align: justify;
+	font-size: 0.8em;
+	font-weight: normal;
+	background: transparent url("../images/people-entry-center-right.png") repeat-y center right;
+	padding-bottom:10px;
+	position: relative;
+	overflow: auto;
+}
+.blog-entry-content img {
+	max-width: 575px;
+	margin-left: 2ex;
+}
+.blog-entry-footer {
+	background: transparent url("../images/people-entry-bottom-center.png") repeat-x bottom center;
+}
+.blog-entry-timestamp {
+	font-size: x-small;
+	text-align: right;
+	color: #b3b3b3;
+	background: transparent url("../images/people-entry-bottom-left.png") no-repeat bottom left;
+}
+.blog-entry-timestamp a {
+	display: block;
+	color: #b3b3b3;
+	text-decoration: none;
+	height: 35px;
+	background: transparent url("../images/people-entry-bottom-right.png") no-repeat bottom right;
+	padding: 1em 5em 0 0;
+}
+#disclaimer {
+	font-size: x-small;
+	color: #b3b3b3;
+	text-align: center;
+	padding: 1em;
+}
+#sidebar {
+	color: #555555;
+	background-color: #eeeff1;
+	font-size: 0.8em;
+	position: absolute;
+	width: 210px;
+	min-width: 210px;
+	max-width: 210px;
+	top: 0;
+	right: 0;
+	margin: 0;
+	border-left: 2px solid white;
+	height: 100%;
+}
+#sidebar #sidebar-header {
+	display: block;
+	background-color: #2963a5;
+}
+#sidebar-inner {
+	padding: 10px;
+}
+#sidebar h2 {
+	font-size: 1.4em;
+	font-weight: normal;
+	border-bottom: 1px solid #cfd4d9;
+	margin: 5px 0px;
+	padding: 0px 5px;
+}
+
+#sidebar ul {
+	list-style: square inside;
+	padding: 0;
+	margin: 0 0 1em 0;
+	color: #22538b;
+}
+#spacer {
+	height: 1em;
+}
+:link {
+	color: #337ACC;
+}
+:visited {
+	color: #6A3B18;
+}
+
diff --git a/roles/planet/files/sub-planets/desktop/css/print.css b/roles/planet/files/sub-planets/desktop/css/print.css
new file mode 100644
index 0000000000..0be9beab70
--- /dev/null
+++ b/roles/planet/files/sub-planets/desktop/css/print.css
@@ -0,0 +1,86 @@
+body {
+	background: white;
+	color: black;
+	font-size: 10pt;
+	font-family: sans-serif;
+	line-height: 1.25em;
+}
+
+div {
+	border: 1px solid white;
+}
+li {
+	border: 1px solid white;
+	margin: 0;
+}
+li p {
+	display: inline;
+}
+
+h1 {
+	font-size: 16pt;
+}
+h2 {
+	font-size: 12pt;
+}
+h3,h4,h5 {
+	font-size: 10pt;
+}
+img {
+	border: 1px solid white;
+	background-color: white;
+}
+hr {
+	border: 1px dotted gray;
+	border-width: 0 0 1 0;
+	margin: 1em;
+}
+table {
+	border-collapse: collapse;
+}
+td,th {
+	border: 1px solid gray;
+	padding: 8pt;
+	font-size: 10pt;
+}
+th {
+	font-weight: bold;
+}
+#fedora-header, #fedora-footer {
+	text-align: center;
+}
+#fedora-header-items, #fedora-side-left, #fedora-side-right {
+	display: none;
+}
+
+#fedora-project-download dt {
+	font-weight: bold;
+	margin-top: 8pt;
+	margin-left: 5pt;
+}
+#fedora-project-download dd {
+	padding: 0;
+	margin: 10px 20px 0;
+}
+
+code.screen, pre.screen {
+	font-family: monospace;
+	font-size: 1em;
+	display: block;
+	padding: 5pt;
+	border: 1px dashed gray;
+	margin: 0.5em 2em;
+}
+#fedora-project code.screen {
+	margin: 0;
+}
+
+/*
+#fedora-content a:link:after, #fedora-content a:visited:after {
+	content: " (" attr(href) ") ";
+	font-size: 80%;
+}
+*/
+.navheader table, .navheader table td {
+	border: 0 !important;
+}
diff --git a/roles/planet/files/sub-planets/desktop/fpbuilder.conf b/roles/planet/files/sub-planets/desktop/fpbuilder.conf
new file mode 100644
index 0000000000..a91a189a3d
--- /dev/null
+++ b/roles/planet/files/sub-planets/desktop/fpbuilder.conf
@@ -0,0 +1,5 @@
+[main]
+base_config=/etc/planet/desktop/base_config
+output=/srv/planet/site/desktop/planet.ini
+group=desktop
+
diff --git a/roles/planet/files/sub-planets/desktop/images/blue.png b/roles/planet/files/sub-planets/desktop/images/blue.png
new file mode 100644
index 0000000000..6987cab624
Binary files /dev/null and b/roles/planet/files/sub-planets/desktop/images/blue.png differ
diff --git a/roles/planet/files/sub-planets/desktop/images/corner-bl.png b/roles/planet/files/sub-planets/desktop/images/corner-bl.png
new file mode 100644
index 0000000000..58d269c306
Binary files /dev/null and b/roles/planet/files/sub-planets/desktop/images/corner-bl.png differ
diff --git a/roles/planet/files/sub-planets/desktop/images/corner-br.png b/roles/planet/files/sub-planets/desktop/images/corner-br.png
new file mode 100644
index 0000000000..c03dd92bec
Binary files /dev/null and b/roles/planet/files/sub-planets/desktop/images/corner-br.png differ
diff --git a/roles/planet/files/sub-planets/desktop/images/corner-tl.png b/roles/planet/files/sub-planets/desktop/images/corner-tl.png
new file mode 100644
index 0000000000..08ab7a3ac2
Binary files /dev/null and b/roles/planet/files/sub-planets/desktop/images/corner-tl.png differ
diff --git a/roles/planet/files/sub-planets/desktop/images/corner-tr.png b/roles/planet/files/sub-planets/desktop/images/corner-tr.png
new file mode 100644
index 0000000000..b279db2961
Binary files /dev/null and b/roles/planet/files/sub-planets/desktop/images/corner-tr.png differ
diff --git a/roles/planet/files/sub-planets/desktop/images/favicon.ico b/roles/planet/files/sub-planets/desktop/images/favicon.ico
new file mode 100644
index 0000000000..d1ae2d209a
Binary files /dev/null and b/roles/planet/files/sub-planets/desktop/images/favicon.ico differ
diff --git a/roles/planet/files/sub-planets/desktop/images/header-download.png b/roles/planet/files/sub-planets/desktop/images/header-download.png
new file mode 100644
index 0000000000..a1cf3e577e
Binary files /dev/null and b/roles/planet/files/sub-planets/desktop/images/header-download.png differ
diff --git a/roles/planet/files/sub-planets/desktop/images/header-faq.png b/roles/planet/files/sub-planets/desktop/images/header-faq.png
new file mode 100644
index 0000000000..1e7c3c95d3
Binary files /dev/null and b/roles/planet/files/sub-planets/desktop/images/header-faq.png differ
diff --git a/roles/planet/files/sub-planets/desktop/images/header-fedora_logo.png b/roles/planet/files/sub-planets/desktop/images/header-fedora_logo.png
new file mode 100644
index 0000000000..552f201643
Binary files /dev/null and b/roles/planet/files/sub-planets/desktop/images/header-fedora_logo.png differ
diff --git a/roles/planet/files/sub-planets/desktop/images/header-projects.png b/roles/planet/files/sub-planets/desktop/images/header-projects.png
new file mode 100644
index 0000000000..aad307edd2
Binary files /dev/null and b/roles/planet/files/sub-planets/desktop/images/header-projects.png differ
diff --git a/roles/planet/files/sub-planets/desktop/images/heads/default.png b/roles/planet/files/sub-planets/desktop/images/heads/default.png
new file mode 100644
index 0000000000..407185b503
Binary files /dev/null and b/roles/planet/files/sub-planets/desktop/images/heads/default.png differ
diff --git a/roles/planet/files/sub-planets/desktop/images/intro-computer.png b/roles/planet/files/sub-planets/desktop/images/intro-computer.png
new file mode 100644
index 0000000000..9298aecea3
Binary files /dev/null and b/roles/planet/files/sub-planets/desktop/images/intro-computer.png differ
diff --git a/roles/planet/files/sub-planets/desktop/images/intro-download.png b/roles/planet/files/sub-planets/desktop/images/intro-download.png
new file mode 100644
index 0000000000..c77db0be2d
Binary files /dev/null and b/roles/planet/files/sub-planets/desktop/images/intro-download.png differ
diff --git a/roles/planet/files/sub-planets/desktop/images/logo-spacer.png b/roles/planet/files/sub-planets/desktop/images/logo-spacer.png
new file mode 100644
index 0000000000..a104f5535f
Binary files /dev/null and b/roles/planet/files/sub-planets/desktop/images/logo-spacer.png differ
diff --git a/roles/planet/files/sub-planets/desktop/images/logo.png b/roles/planet/files/sub-planets/desktop/images/logo.png
new file mode 100644
index 0000000000..f277bf9281
Binary files /dev/null and b/roles/planet/files/sub-planets/desktop/images/logo.png differ
diff --git a/roles/planet/files/sub-planets/desktop/images/mainBack.png b/roles/planet/files/sub-planets/desktop/images/mainBack.png
new file mode 100644
index 0000000000..1372780be6
Binary files /dev/null and b/roles/planet/files/sub-planets/desktop/images/mainBack.png differ
diff --git a/roles/planet/files/sub-planets/desktop/images/people-entry-bottom-center.png b/roles/planet/files/sub-planets/desktop/images/people-entry-bottom-center.png
new file mode 100644
index 0000000000..8d8ee6ace4
Binary files /dev/null and b/roles/planet/files/sub-planets/desktop/images/people-entry-bottom-center.png differ
diff --git a/roles/planet/files/sub-planets/desktop/images/people-entry-bottom-left.png b/roles/planet/files/sub-planets/desktop/images/people-entry-bottom-left.png
new file mode 100644
index 0000000000..1aadc48c53
Binary files /dev/null and b/roles/planet/files/sub-planets/desktop/images/people-entry-bottom-left.png differ
diff --git a/roles/planet/files/sub-planets/desktop/images/people-entry-bottom-right.png b/roles/planet/files/sub-planets/desktop/images/people-entry-bottom-right.png
new file mode 100644
index 0000000000..047c9081f9
Binary files /dev/null and b/roles/planet/files/sub-planets/desktop/images/people-entry-bottom-right.png differ
diff --git a/roles/planet/files/sub-planets/desktop/images/people-entry-center-left.png b/roles/planet/files/sub-planets/desktop/images/people-entry-center-left.png
new file mode 100644
index 0000000000..9da8d17866
Binary files /dev/null and b/roles/planet/files/sub-planets/desktop/images/people-entry-center-left.png differ
diff --git a/roles/planet/files/sub-planets/desktop/images/people-entry-center-right.png b/roles/planet/files/sub-planets/desktop/images/people-entry-center-right.png
new file mode 100644
index 0000000000..379c8c0671
Binary files /dev/null and b/roles/planet/files/sub-planets/desktop/images/people-entry-center-right.png differ
diff --git a/roles/planet/files/sub-planets/desktop/images/people-entry-group-date-background.png b/roles/planet/files/sub-planets/desktop/images/people-entry-group-date-background.png
new file mode 100644
index 0000000000..f029a675a4
Binary files /dev/null and b/roles/planet/files/sub-planets/desktop/images/people-entry-group-date-background.png differ
diff --git a/roles/planet/files/sub-planets/desktop/images/people-entry-group-date-header.png b/roles/planet/files/sub-planets/desktop/images/people-entry-group-date-header.png
new file mode 100644
index 0000000000..47ee607a41
Binary files /dev/null and b/roles/planet/files/sub-planets/desktop/images/people-entry-group-date-header.png differ
diff --git a/roles/planet/files/sub-planets/desktop/images/people-entry-top-center.png b/roles/planet/files/sub-planets/desktop/images/people-entry-top-center.png
new file mode 100644
index 0000000000..6b3b33aebf
Binary files /dev/null and b/roles/planet/files/sub-planets/desktop/images/people-entry-top-center.png differ
diff --git a/roles/planet/files/sub-planets/desktop/images/people-entry-top-left.png b/roles/planet/files/sub-planets/desktop/images/people-entry-top-left.png
new file mode 100644
index 0000000000..007a1e2850
Binary files /dev/null and b/roles/planet/files/sub-planets/desktop/images/people-entry-top-left.png differ
diff --git a/roles/planet/files/sub-planets/desktop/images/people-entry-top-right.png b/roles/planet/files/sub-planets/desktop/images/people-entry-top-right.png
new file mode 100644
index 0000000000..bfb41fb2a2
Binary files /dev/null and b/roles/planet/files/sub-planets/desktop/images/people-entry-top-right.png differ
diff --git a/roles/planet/files/sub-planets/desktop/images/people-header.png b/roles/planet/files/sub-planets/desktop/images/people-header.png
new file mode 100644
index 0000000000..d1fcbbc3c1
Binary files /dev/null and b/roles/planet/files/sub-planets/desktop/images/people-header.png differ
diff --git a/roles/planet/files/sub-planets/desktop/images/people-logo.png b/roles/planet/files/sub-planets/desktop/images/people-logo.png
new file mode 100644
index 0000000000..6404e088f1
Binary files /dev/null and b/roles/planet/files/sub-planets/desktop/images/people-logo.png differ
diff --git a/roles/planet/files/sub-planets/desktop/images/people-sidebar-header.png b/roles/planet/files/sub-planets/desktop/images/people-sidebar-header.png
new file mode 100644
index 0000000000..c82025672e
Binary files /dev/null and b/roles/planet/files/sub-planets/desktop/images/people-sidebar-header.png differ
diff --git a/roles/planet/files/sub-planets/desktop/images/planet.png b/roles/planet/files/sub-planets/desktop/images/planet.png
new file mode 100644
index 0000000000..9606a0c30d
Binary files /dev/null and b/roles/planet/files/sub-planets/desktop/images/planet.png differ
diff --git a/roles/planet/files/sub-planets/desktop/planet-group.cron b/roles/planet/files/sub-planets/desktop/planet-group.cron
new file mode 100644
index 0000000000..e58d38d46a
--- /dev/null
+++ b/roles/planet/files/sub-planets/desktop/planet-group.cron
@@ -0,0 +1,2 @@
+*/20 * * * * planet-user bash /usr/local/bin/pull-run-planet-config.sh /etc/planet/desktop/fpbuilder.conf >>/dev/null 2>&1
+10 4 * * * *  planet-user /usr/sbin/tmpwatch 360 /srv/planet/config/desktop/cache >>/dev/null
\ No newline at end of file
diff --git a/roles/planet/files/sub-planets/desktop/templates/atom.xml.tmpl b/roles/planet/files/sub-planets/desktop/templates/atom.xml.tmpl
new file mode 100644
index 0000000000..85282dc0b1
--- /dev/null
+++ b/roles/planet/files/sub-planets/desktop/templates/atom.xml.tmpl
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+
+	<title><TMPL_VAR name></title>
+	<link rel="self" href="<TMPL_VAR feed ESCAPE="HTML">"/>
+	<link href="<TMPL_VAR link ESCAPE="HTML">"/>
+	<id><TMPL_VAR feed ESCAPE="HTML"></id>
+	<updated><TMPL_VAR date_iso></updated>
+	<generator uri="http://planet.fedoraproject.org/desktop/"><TMPL_VAR generator ESCAPE="HTML"></generator>
+
+<TMPL_LOOP Items>
+	<entry<TMPL_IF channel_language> xml:lang="<TMPL_VAR channel_language>"</TMPL_IF>>
+		<title type="html"<TMPL_IF title_language> xml:lang="<TMPL_VAR title_language>"</TMPL_IF>><TMPL_VAR title ESCAPE="HTML"></title>
+		<link href="<TMPL_VAR link ESCAPE="HTML">"/>
+		<id><TMPL_VAR id ESCAPE="HTML"></id>
+		<updated><TMPL_VAR date_iso></updated>
+		<content type="html"<TMPL_IF content_language> xml:lang="<TMPL_VAR content_language>"</TMPL_IF>>
+                <TMPL_IF channel_face>
+			&lt;img src=&quot;<TMPL_VAR channel_face ESCAPE="HTML">&quot; <TMPL_IF channel_facewidth>width=&quot;<TMPL_VAR channel_facewidth>&quot; </TMPL_IF><TMPL_IF channel_faceheight>height=&quot;<TMPL_VAR channel_faceheight>&quot; </TMPL_IF> alt=&quot;&quot; style=&quot;float: right;&quot;&gt;
+		</TMPL_IF> <TMPL_VAR content ESCAPE="HTML"></content>
+		<author>
+<TMPL_IF author_name>
+			<name><TMPL_VAR author_name ESCAPE="HTML"></name>
+<TMPL_IF author_email>
+			<email><TMPL_VAR author_email ESCAPE="HTML"></email>
+</TMPL_IF author_email>
+<TMPL_ELSE>
+<TMPL_IF channel_author_name>
+			<name><TMPL_VAR channel_author_name ESCAPE="HTML"></name>
+<TMPL_IF channel_author_email>
+			<email><TMPL_VAR channel_author_email ESCAPE="HTML"></email>
+</TMPL_IF channel_author_email>
+<TMPL_ELSE>
+			<name><TMPL_VAR channel_name ESCAPE="HTML"></name>
+</TMPL_IF>
+</TMPL_IF>
+			<uri><TMPL_VAR channel_link ESCAPE="HTML"></uri>
+		</author>
+		<source>
+<TMPL_IF channel_title>
+			<title type="html"><TMPL_VAR channel_title ESCAPE="HTML"></title>
+<TMPL_ELSE>
+			<title type="html"><TMPL_VAR channel_name ESCAPE="HTML"></title>
+</TMPL_IF>
+<TMPL_IF channel_subtitle>
+			<subtitle type="html"><TMPL_VAR channel_subtitle ESCAPE="HTML"></subtitle>
+</TMPL_IF>
+			<link rel="self" href="<TMPL_VAR channel_url ESCAPE="HTML">"/>
+<TMPL_IF channel_id>
+			<id><TMPL_VAR channel_id ESCAPE="HTML"></id>
+<TMPL_ELSE>
+			<id><TMPL_VAR channel_url ESCAPE="HTML"></id>
+</TMPL_IF>
+<TMPL_IF channel_updated_iso>
+			<updated><TMPL_VAR channel_updated_iso></updated>
+</TMPL_IF>
+<TMPL_IF channel_rights>
+			<rights type="html"><TMPL_VAR channel_rights ESCAPE="HTML"></rights>
+</TMPL_IF>
+		</source>
+	</entry>
+
+</TMPL_LOOP>
+</feed>
diff --git a/roles/planet/files/sub-planets/desktop/templates/foafroll.xml.tmpl b/roles/planet/files/sub-planets/desktop/templates/foafroll.xml.tmpl
new file mode 100644
index 0000000000..b2cecf3548
--- /dev/null
+++ b/roles/planet/files/sub-planets/desktop/templates/foafroll.xml.tmpl
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<rdf:RDF
+	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+	xmlns:foaf="http://xmlns.com/foaf/0.1/"
+	xmlns:rss="http://purl.org/rss/1.0/"
+	xmlns:dc="http://purl.org/dc/elements/1.1/"
+>
+<foaf:Group>
+	<foaf:name><TMPL_VAR name></foaf:name>
+	<foaf:homepage><TMPL_VAR link></foaf:homepage>
+	<rdfs:seeAlso rdf:resource="<TMPL_VAR uri ESCAPE="HTML">" />
+
+<TMPL_LOOP Channels>
+	<foaf:member>
+		<foaf:Agent>
+			<foaf:name><TMPL_VAR name></foaf:name>
+			<foaf:weblog>
+				<foaf:Document rdf:about="<TMPL_VAR link ESCAPE="HTML">">
+					<dc:title><TMPL_VAR title></dc:title>
+					<rdfs:seeAlso>
+						<rss:channel rdf:about="<TMPL_VAR uri ESCAPE="HTML">" />
+					</rdfs:seeAlso>
+				</foaf:Document>
+			</foaf:weblog>
+		</foaf:Agent>
+	</foaf:member>
+</TMPL_LOOP>
+
+</foaf:Group>
+</rdf:RDF>
diff --git a/roles/planet/files/sub-planets/desktop/templates/heads.html.tmpl b/roles/planet/files/sub-planets/desktop/templates/heads.html.tmpl
new file mode 100644
index 0000000000..a12c860dca
--- /dev/null
+++ b/roles/planet/files/sub-planets/desktop/templates/heads.html.tmpl
@@ -0,0 +1,97 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<title>Planet Fedora desktop</title>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8">
+    <meta http-equiv="Content-Type" content="text/html">
+    <meta name="MSSmartTagsPreventParsing" content="TRUE">
+    <link rel="stylesheet" type="text/css" media="print" href="http://planet.fedoraproject.org/css/print.css">
+    <link rel="stylesheet" type="text/css" media="all" href="http://fedoraproject.org/static/css/fedora.css">
+    <link rel="stylesheet" type="text/css" media="all" href="/css/fedora_planet.css">
+    <link rel="shortcut icon" href="/images/favicon.ico">
+    <link rel="icon" href="/images/favicon.ico">
+    <style type="text/css">
+        #content ul {
+            overflow: auto;
+            list-style: none;
+        }
+        #content ul li {
+            height: 160px;
+            float: left;
+            text-align: center;
+            margin: 1em;
+        }
+        #content ul li img {
+            display: block;
+            margin: 0 auto;
+        }
+    </style>
+</head>
+<body class="home">
+    <div id="wrapper">
+
+        <div id="head">
+            <h1><a href="http://fedoraproject.org/">Fedora</a></h1>
+        </div>
+
+        <div id="sidebar">
+            <div id="planet_nav">
+
+                <h2>Feeds</h2>
+                <a href="rss10.xml">RSS 1.0</a><br>
+                <a href="rss20.xml">RSS 2.0</a><br>
+                <a href="atom.xml">Atom 1.0</a><br>
+                <a href="foafroll.xml">FOAF blogroll</a><br>
+
+                <h2>Links</h2>
+                <ul>
+                    <li><a href="http://fedoraproject.org">Fedora Home</a></li>
+                    <li><a href="http://fedoranews.org">Fedora News</a></li>
+                    <li><a href="http://planet.fedoraproject.org/heads/">Hackergotchi Heads</a></li>
+                    <li><a href="http://fedoraproject.org/infofeed/">Fedora Info</a></li>
+                </ul>
+
+                <h2>People</h2>
+                <ul id="people_feeds">
+
+                <TMPL_LOOP Channels>
+                    <li><a href="<TMPL_VAR url ESCAPE="HTML">"><img src="/images/rss.png" alt="RSS"></a><a href="<TMPL_VAR link>" title="<TMPL_VAR title>"><TMPL_VAR name></a></li>
+                </TMPL_LOOP>
+                </ul>
+
+                <h2>Add your blog</h2>
+                <ul><li><a href="http://fedoraproject.org/wiki/Planet_HowTo">Add your blog</a></li></ul>
+		<ul><li><div class="fedora_planet">"The content on this page is provided by Fedora contributors, and represents their individual viewpoints, and not necessarily those of the Fedora Project or any of its sponsors or other members."</div></a></li></ul>
+            </div>
+        </div>
+
+
+        <div id="content">
+            <div class="spacer">
+            </div> <!-- :-} -->
+<ul>
+<TMPL_LOOP Channels>
+<!--<li class="head"><TMPL_IF link><a href="<TMPL_VAR link>" title="<TMPL_VAR title>"></TMPL_IF><img src="<TMPL_VAR face ESCAPE="HTML">" <TMPL_IF facewidth>width="<TMPL_VAR facewidth>" </TMPL_IF><TMPL_IF faceheight>height="<TMPL_VAR faceheight>" </TMPL_IF>alt="" /><TMPL_VAR name><TMPL_IF link></a></TMPL_IF></li>-->
+<li class="head"><TMPL_IF link><a href="<TMPL_VAR link ESCAPE="HTML">" title="<TMPL_VAR title>"></TMPL_IF><img src="<TMPL_VAR face ESCAPE="HTML">" /><TMPL_VAR name><TMPL_IF link></a></TMPL_IF></li>
+</TMPL_LOOP>
+</ul>
+
+    </div>
+</div>
+    <div id="bottom">
+        <div id="footer">
+            <p class="copy">&copy; 2010 Red Hat, Inc. and others.  Please send any comments or corrections to the <a href="mailto:webmaster@fedoraproject.org">websites team</a>.</p>
+            <p class="disclaimer">The Fedora Project is maintained and driven by the community and sponsored by Red Hat.  This is a community maintained site.  Red Hat is not responsible for content.</p>
+            <p class="disclaimer">Your words are your own, duh. Nothing here represents Fedora™, Red Hat, Inc, or pretty much anything else. If you think it does then you are badly misled</p>
+            <ul>
+                <li class="first"><a href="/en/sponsors">Sponsors</a></li>
+                <li><a href="http://fedoraproject.org/wiki/Legal">Legal</a></li>
+                <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a></li>
+            </ul>
+        </div>
+    </div>
+
+
+</body>
+</html>
diff --git a/roles/planet/files/sub-planets/desktop/templates/index.html.tmpl b/roles/planet/files/sub-planets/desktop/templates/index.html.tmpl
new file mode 100644
index 0000000000..5eaab29985
--- /dev/null
+++ b/roles/planet/files/sub-planets/desktop/templates/index.html.tmpl
@@ -0,0 +1,112 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<title>Planet Fedora desktop</title>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8">
+    <meta http-equiv="Content-Type" content="text/html">
+    <meta name="MSSmartTagsPreventParsing" content="TRUE">
+    <link rel="stylesheet" type="text/css" media="print" href="http://planet.fedoraproject.org/css/print.css">
+    <link rel="stylesheet" type="text/css" media="all" href="http://fedoraproject.org/static/css/fedora.css">
+    <link rel="stylesheet" type="text/css" media="all" href="/css/fedora_planet.css">
+    <link rel="shortcut icon" href="/images/favicon.ico">
+    <link rel="icon" href="/images/favicon.ico">
+    <link rel="alternate" type="application/xml" title="RSS" href="http://planet.fedoraproject.org/desktop/rss20.xml">
+    <link rel="alternate" type="application/atom+xml" title="Fedora People Atom 1.0" href="http://planet.fedoraproject.org/desktop/atom.xml">
+</head>
+<body class="home">
+    <div id="wrapper">
+
+        <div id="head">
+            <h1><a href="http://fedoraproject.org/">Fedora</a></h1>
+        </div>
+
+        <div id="sidebar">
+            <div id="planet_nav">
+
+                <h2>Feeds</h2>
+                <a href="rss10.xml">RSS 1.0</a><br>
+                <a href="rss20.xml">RSS 2.0</a><br>
+                <a href="atom.xml">Atom 1.0</a><br>
+                <a href="foafroll.xml">FOAF blogroll</a><br>
+
+                <h2>Links</h2>
+                <ul>
+                    <li><a href="http://fedoraproject.org">Fedora Home</a></li>
+                    <li><a href="http://fedoranews.org">Fedora News</a></li>
+                    <li><a href="http://fedoraproject.org/infofeed/">Fedora Info</a></li>
+                </ul>
+
+                <h2>People</h2>
+                <ul id="people_feeds">
+
+                <TMPL_LOOP Channels>
+                    <li><a href="<TMPL_VAR url ESCAPE="HTML">"><img src="images/rss.png" alt="RSS"></a><a href="<TMPL_VAR link ESCAPE="HTML">" title="<TMPL_VAR title ESCAPE="HTML">"><TMPL_VAR name ESCAPE="HTML"></a></li>
+                </TMPL_LOOP>
+                </ul>
+
+                <h2>Add your blog</h2>
+                <ul><li><a href="http://fedoraproject.org/wiki/Planet_HowTo">Add your blog</a></li></ul>
+		<ul><li><div class="fedora_planet">"The content on this page is provided by Fedora contributors, and represents their individual viewpoints, and not necessarily those of the Fedora Project or any of its sponsors or other members."</div></a></li></ul>
+            </div>
+        </div>
+
+
+        <div id="content">
+            <div class="spacer">
+        <TMPL_LOOP Items>
+
+            <TMPL_IF new_date>
+            </div> <!-- :-} -->
+
+            <div class="blog-entries-daily">
+            <h2 class="blog-date"><TMPL_VAR new_date></h2>
+            </TMPL_IF>
+
+
+            <div class="blog-entry <TMPL_VAR channel_name>">
+                <div class="blog-entry-post">
+                    <div class="blog-entry-header">
+                        <div class="blog-entry-author">
+
+                            <TMPL_IF channel_face>
+                                <img src="<TMPL_VAR channel_face ESCAPE="HTML">" <TMPL_IF channel_facewidth>width="<TMPL_VAR channel_facewidth>" </TMPL_IF><TMPL_IF channel_faceheight>height="<TMPL_VAR channel_faceheight>" </TMPL_IF>alt="">
+                                <br><a href="<TMPL_VAR channel_link ESCAPE="HTML">"><TMPL_VAR channel_name></a>
+
+                            </TMPL_IF>
+
+                        </div>
+
+                        <div class="blog-entry-title"><a href="<TMPL_VAR link>"><TMPL_IF title><TMPL_VAR title><TMPL_ELSE>Untitled Post</TMPL_IF></a></div>
+                    </div>
+
+                    <div class="blog-entry-content-container">
+
+                        <div class="blog-entry-content"><TMPL_VAR content></div>
+
+                    </div>
+                    <div class="blog-entry-footer">
+                    <div class="blog-entry-timestamp"><a href="<TMPL_VAR link ESCAPE="HTML">"><TMPL_IF creator>by <TMPL_VAR creator> at </TMPL_IF><TMPL_VAR date></a></div>
+                    </div>
+                </div>
+            </div>
+    </TMPL_LOOP>
+        </div>
+    </div>
+</div>
+    <div id="bottom">
+        <div id="footer">
+            <p class="copy">&copy; 2010 Red Hat, Inc. and others.  Please send any comments or corrections to the <a href="mailto:webmaster@fedoraproject.org">websites team</a>.</p>
+            <p class="disclaimer">The Fedora Project is maintained and driven by the community and sponsored by Red Hat.  This is a community maintained site.  Red Hat is not responsible for content.</p>
+            <p class="disclaimer">Your words are your own, duh. Nothing here represents Fedora™, Red Hat, Inc, or pretty much anything else. If you think it does then you are badly misled</p>
+            <ul>
+                <li class="first"><a href="/en/sponsors">Sponsors</a></li>
+                <li><a href="http://fedoraproject.org/wiki/Legal">Legal</a></li>
+                <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a></li>
+            </ul>
+        </div>
+    </div>
+
+
+</body>
+</html>
diff --git a/roles/planet/files/sub-planets/desktop/templates/opml.xml.tmpl b/roles/planet/files/sub-planets/desktop/templates/opml.xml.tmpl
new file mode 100644
index 0000000000..aaa8833810
--- /dev/null
+++ b/roles/planet/files/sub-planets/desktop/templates/opml.xml.tmpl
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<opml version="1.1">
+	<head>
+		<title><TMPL_VAR name></title>
+		<dateCreated><TMPL_VAR date_822></dateCreated>
+		<dateModified><TMPL_VAR date_822></dateModified>
+		<ownerName><TMPL_VAR owner_name></ownerName>
+		<ownerEmail><TMPL_VAR owner_email></ownerEmail>
+	</head>
+	
+	<body>
+		<TMPL_LOOP Channels>
+		<outline text="<TMPL_VAR name ESCAPE="HTML">" xmlUrl="<TMPL_VAR url ESCAPE="HTML">"/>
+		</TMPL_LOOP>
+	</body>
+</opml>
diff --git a/roles/planet/files/sub-planets/desktop/templates/rss10.xml.tmpl b/roles/planet/files/sub-planets/desktop/templates/rss10.xml.tmpl
new file mode 100644
index 0000000000..9596f958cd
--- /dev/null
+++ b/roles/planet/files/sub-planets/desktop/templates/rss10.xml.tmpl
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<rdf:RDF
+	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	xmlns:dc="http://purl.org/dc/elements/1.1/"
+	xmlns:foaf="http://xmlns.com/foaf/0.1/"
+	xmlns:content="http://purl.org/rss/1.0/modules/content/"
+	xmlns="http://purl.org/rss/1.0/"
+>
+<channel rdf:about="<TMPL_VAR link ESCAPE="HTML">">
+	<title><TMPL_VAR name></title>
+    <link><TMPL_VAR link ESCAPE="HTML"></link>
+        <description>Fedora People: http://planet.fedoraproject.org/desktop</description>
+	<items>
+		<rdf:Seq>
+<TMPL_LOOP Items>
+			<rdf:li rdf:resource="<TMPL_VAR id ESCAPE="HTML">" />
+</TMPL_LOOP>
+		</rdf:Seq>
+	</items>
+</channel>
+
+<TMPL_LOOP Items>
+<item rdf:about="<TMPL_VAR id ESCAPE="HTML">">
+	<title><TMPL_VAR channel_name><TMPL_IF title>: <TMPL_VAR title></TMPL_IF></title>
+    <link><TMPL_VAR link ESCAPE="HTML"></link>
+	<TMPL_IF content>
+	<content:encoded><TMPL_VAR content ESCAPE="HTML"></content:encoded>
+	</TMPL_IF>
+	<dc:date><TMPL_VAR date_iso></dc:date>
+</item>
+</TMPL_LOOP>
+
+</rdf:RDF>
diff --git a/roles/planet/files/sub-planets/desktop/templates/rss20.xml.tmpl b/roles/planet/files/sub-planets/desktop/templates/rss20.xml.tmpl
new file mode 100644
index 0000000000..ecb247433c
--- /dev/null
+++ b/roles/planet/files/sub-planets/desktop/templates/rss20.xml.tmpl
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
+<channel>
+   <atom:link href="http://planet.fedoraproject.org/desktop/rss20.xml" rel="self" type="application/rss+xml" />
+	<title><TMPL_VAR name></title>
+	<link><TMPL_VAR link></link>
+	<language>en</language>
+        <description>Fedora People: http://planet.fedoraproject.org/desktop</description>
+
+<TMPL_LOOP Items>
+<item>
+	<title><TMPL_VAR channel_name><TMPL_IF title>: <TMPL_VAR title></TMPL_IF></title>
+	<guid isPermaLink="false"><TMPL_VAR id ESCAPE="HTML"></guid>
+	<link><TMPL_VAR link ESCAPE="HTML"></link>
+	<TMPL_IF content>
+
+	<description>
+		<TMPL_IF channel_face>
+			&lt;img src=&quot;<TMPL_VAR channel_face ESCAPE="HTML">&quot; <TMPL_IF channel_facewidth>width=&quot;<TMPL_VAR channel_facewidth>&quot; </TMPL_IF><TMPL_IF channel_faceheight>height=&quot;<TMPL_VAR channel_faceheight>&quot; </TMPL_IF> alt=&quot;&quot; style=&quot;float: right;&quot;&gt;
+		</TMPL_IF>
+		<TMPL_VAR content ESCAPE="HTML"></description>
+	</TMPL_IF>
+	<pubDate><TMPL_VAR date_822></pubDate>
+</item>
+</TMPL_LOOP>
+
+</channel>
+</rss>
diff --git a/roles/planet/files/sub-planets/edited/base_config b/roles/planet/files/sub-planets/edited/base_config
new file mode 100644
index 0000000000..93f96a7da0
--- /dev/null
+++ b/roles/planet/files/sub-planets/edited/base_config
@@ -0,0 +1,100 @@
+[Planet]
+name = Just Fedora Planet
+link = http://planet.fedoraproject.org/edited/
+owner_name = Fedora Admin
+owner_email = admin@fedoraproject.org
+cache_directory = /srv/planet/config/edited/cache
+template_files = /srv/planet/config/edited/templates/index.html.tmpl /srv/planet/config/edited/templates/rss20.xml.tmpl /srv/planet/config/edited/templates/rss10.xml.tmpl //srv/planet/config/edited/templates/opml.xml.tmpl ///srv/planet/config/edited/templates/foafroll.xml.tmpl ////srv/planet/config/edited/templates/atom.xml.tmpl /////srv/planet/config/edited/templates/heads.html.tmpl 
+output_dir = /srv/planet/site/edited
+items_per_page = 50
+log_level = ERROR
+date_format = %B %d, %Y %I:%M %p
+spider_threads=20
+#
+#     [DEFAULT]
+#     facewidth = 64
+#     faceheight = 64
+#
+#     [http://www.blog.com/rss]
+#     face = foo.png
+#     faceheight = 32
+#
+# The facewidth of the defined blog defaults to 64.
+
+[DEFAULT]
+face = http://planet.fedoraproject.org/edited/images/heads/default.png
+
+[http://mairin.wordpress.com/category/fedora/feed/]
+name = Máirín Duffy
+face = http://duffy.fedorapeople.org/mo.png
+
+[http://blogs.fedoraproject.org/wp/designteam/?feed=rss2]
+name = Fedora Design Team
+face = http://duffy.fedorapeople.org/Fedora-Design-Hackergotchi.png
+
+[http://www.jaredsmith.net/topics/linux/fedora/feed]
+name = Jared Smith
+face = http://jsmith.fedorapeople.org/Images/Jared_Smith.png
+
+[http://pierros.papadeas.gr/?feed=rss2&tag=fedora]
+name = Papadeas Pierros
+face = https://fedoraproject.org/w/uploads/5/59/Hackergotchi-Ppapadeas.png
+
+[http://mostafadaneshvar.com/tag/fedora/feed/]
+name = Mostafa Daneshvar
+face = http://lashar.fedorapeople.org/mostafa21.png
+
+[http://morefedora.blogspot.com/feeds/posts/default/-/justfedora/?alt=rss]
+name = Gianluca Sforna
+face = http://www.gravatar.com/avatar/a47795df6968fe5645cd3b6b94235e86?s=80
+
+[http://planet.ergo-project.org/taxonomy/term/3/0/feed]
+name = Jeroen van Meeuwen
+
+[http://gomix.fedora-ve.org/projects/fedobetatest/news.atom]
+name = Guillermo Gómez
+face = http://gomix.fedorapeople.org/images/ggs-rc1.png
+
+[http://blog.famillecollet.com/feed/tag/fedoraplanet/atom]
+name = Remi Collet
+face = http://remi.fedorapeople.org/remicollet.png
+
+[http://domsch.com/blog/?feed=rss2&tag=fedora]
+name = Matt Domsch
+face = http://mdomsch.fedorapeople.org/headshot-80x80.jpg
+
+[http://paul.frields.org/category/fedora/feed]
+name = Paul Frields
+face = http://fedoraproject.org/w/uploads/0/0c/PaulWFrields_PaulWFrields-head.png
+
+[http://www.awe.com/mark/blog/index.rss?-tags=fedora,redhat,security]
+name = Mark Cox
+face=http://planet.fedoraproject.org/heads/mjcox.png
+fasname=mjc
+
+[http://blog.chris.tylers.info/index.php?/feeds/categories/24-JustFedora-Planet.rss]
+name = Chris Tyler
+face = http://zenit.senecac.on.ca/~chris.tyler/chris_tyler_hackergotchi_4a.png
+fasname=ctyler
+
+[http://www.fedora-it.org/news/feed/justfedora]
+name = Fedora Italia
+
+[http://vinzv.de/tag/fedora/feed]
+name = Vinzenz Vietzke
+face = http://vinz.fedorapeople.org/vinz.png
+fasname=vinz
+
+[http://feeds.feedburner.com/fedora-blog/Ycyp]
+name = Fedora-Blog.de
+face = http://vinz.fedorapeople.org/fedorablogde.png
+
+[http://www.christoph-wickert.de/kategorien/linux/fedora/feed/]
+name = Christoph Wickert
+face = http://christoph-wickert.de/cwickert-hackergotchi-new.png
+fasname = cwickert
+
+[http://anonbadger.wordpress.com/tag/fedora/feed/]
+name = Toshio Kuratomi
+face = http://toshio.fedorapeople.org/toshio.png
+fasname = toshio
diff --git a/roles/planet/files/sub-planets/edited/css/content.css b/roles/planet/files/sub-planets/edited/css/content.css
new file mode 100644
index 0000000000..982924ee61
--- /dev/null
+++ b/roles/planet/files/sub-planets/edited/css/content.css
@@ -0,0 +1,237 @@
+.name-project, .name-release, .name-version {
+}
+
+/* Front page H1 */
+#page-main h1 {
+	font-size: 1.35em;
+}
+
+#page-main h1.center {
+	text-align: center;
+}
+
+h1, h2, h3, h4 {
+	/*
+	font-style: italic;
+	*/
+	font-family: luxi sans,sans-serif;
+}
+h1 {
+	font-size: 1.75em;
+}
+
+h2 {
+	font-size: 1.25em;
+#	background-color: #eee;
+}
+
+h3 {
+	font-size: 1.1em;
+}
+
+hr {
+	border: 0;
+	border-bottom: 1px solid #ccc;
+}
+
+.fedora-side-right-content {
+	padding: 1 5px 1.5em;
+	font-size: 1em;
+}
+#fedora-side-right h1, #fedora-side-right h2, #fedora-side-right h3 {
+	margin: 0;
+	padding: 0 4pt 0;
+	font-size: 1em;
+	letter-spacing: 2pt;
+	border-bottom: 1px solid #bbb;
+}
+#fedora-side-right hr {
+	border-bottom: 1px solid #aaa;
+	margin: 0.5em 0;
+}
+
+table tr {
+	font-size: 0.9em; 
+}
+
+
+#link-offsite {
+}
+.link-offsite-notation {
+	font-size: 0.9em;
+	color: #777;
+	padding-left: 1pt;
+	text-decoration: none !important;
+}
+#fedora-content .link-offsite-notation {
+	color: #999;
+}
+#link-redhat {
+}
+#fedora-content #link-redhat {
+}
+#link-internal {
+}
+
+#fedora-content li {
+	padding: 1pt;
+}
+#fedora-content h1 {
+	margin-top: 0;
+}
+
+#fedora-content a img {
+	margin: 1px;
+	border: 0;
+}
+#fedora-content a:hover img {
+	margin: 0;
+	border: 1px solid #f00;
+}
+#fedora-content a img.noborder {
+	margin: 0;
+	border: 0;
+}
+#fedora-content a:hover img .noborder {
+	margin: 0;
+	border: 0;
+}
+
+#fedora-project-maintainers p, #fedora-project-contributors p, #fedora-project-bugs p {
+	margin-left: 5pt;
+}
+
+#fedora-project-download dt {
+	font-weight: bold;
+	margin-top: 8pt;
+	margin-left: 5pt;
+}
+#fedora-project-download dd {
+	padding: 0;
+	margin: 10px 20px 0;
+}
+#fedora-project-screenshots a img {
+	margin: 5px;
+}
+#fedora-project-screenshots a:hover img {
+	margin: 4px;
+}
+#fedora-project-todo ul {
+	border: 1px solid #cad4e9;
+	margin: 0 1em;
+	padding: 0;
+	list-style: none;
+	border-radius: 2.5px;
+	-moz-border-radius: 2.5px;
+}
+#fedora-project-todo li {
+	margin: 0;
+	padding: 6px 8px;
+}
+#fedora-project-todo li.odd {
+	background-color: #ecf0f7;
+}
+#fedora-project-todo li.even {
+	background-color: #f7f9fc;
+}
+
+#fedora-list-packages {
+	border-collapse: collapse;
+	border: 1px solid #cad4e9;
+	border-radius: 2.5px;
+	-moz-border-radius: 2.5px;
+}
+#fedora-list-packages tr.odd td {
+	background-color: #ecf0f7;
+}
+#fedora-list-packages tr.even td {
+	background-color: #f7f9fc;
+}
+#fedora-list-packages th,
+#fedora-list-packages td {
+	margin: 0;
+	padding: 6px 8px;
+}
+#fedora-list-packages td.column-2 {
+	text-align: center;
+}
+#fedora-list-packages th {
+	background-color: #cad4e9;
+	color: #000;
+	font-weight: bold;
+	text-align: center;
+
+}
+
+/* pre.screen is for DocBook HTML output */
+code.screen, pre.screen {
+	font-family: monospace;
+	font-size: 1em;
+	display: block;
+	padding: 10px;
+	border: 1px solid #bbb;
+	background-color: #eee;
+	color: #000;
+	overflow: auto;
+	border-radius: 2.5px;
+	-moz-border-radius: 2.5px;
+	margin: 0.5em 2em;
+}
+#fedora-project code.screen {
+	margin: 0;
+}
+
+code.command, code.filename {
+	font-family: monospace;
+}
+
+code.citetitle {
+	font-family: sans-serif;
+	font-style: italic;
+}
+
+strong.application {
+	font-weight: bold;
+}
+.indent {
+	margin: 0 2em;
+}
+.fedora-docs-nav {
+	text-align: center;
+	position: relative;
+	padding: 1em;
+	margin-top: 2em;
+	border-top: 1px solid #ccc;
+}
+.fedora-docs-nav a {
+	padding: 0 1em;
+}
+.fedora-docs-nav-left {
+	position: absolute;
+	left: 0;
+}
+.fedora-docs-nav-right {
+	position: absolute;
+	right: 0;
+}
+
+.fedoraEntry {
+
+padding-left: 10px;
+padding-right: 10px;
+padding-bottom: 10px;
+padding-top: 10px;
+border-bottom: 1px solid #ccc;
+}
+
+.fedoraStory {
+}
+
+.fedoraFace {
+	margin: 0 0 10px 10px;
+	float: right;
+}
+
+.fedoraTitle {
+	font-size: 1.25em;
+}
diff --git a/roles/planet/files/sub-planets/edited/css/docbook.css b/roles/planet/files/sub-planets/edited/css/docbook.css
new file mode 100644
index 0000000000..3181bce246
--- /dev/null
+++ b/roles/planet/files/sub-planets/edited/css/docbook.css
@@ -0,0 +1,71 @@
+#fedora-content li p {
+	margin: 0.2em;
+}
+
+#fedora-content div.table table {
+	width: 95%;
+	background-color: #DCDCDC; 
+	color: #000000;
+	border-spacing: 0;
+}
+
+#fedora-content div.table table th {
+	border: 1px solid #A9A9A9;	
+	background-color: #A9A9A9;
+	color: #000000;
+}
+
+#fedora-content div.table table td {
+	border: 1px solid #A9A9A9; 
+	background-color: #DCDCDC;
+	color: #000000;
+	padding: 0.5em;
+	margin-bottom: 0.5em;
+	margin-top: 2px; 
+
+}
+
+div.note table, div.tip table, div.important table, div.caution table, div.warning table {
+	width: 95%;
+	border: 2px solid #B0C4DE;
+	background-color: #F0F8FF;
+	color: #000000;
+	/* padding inside table area */
+	padding: 0.5em;
+	margin-bottom: 0.5em;
+	margin-top: 0.5em;
+}
+
+/* "Just the FAQs, ma'm." */
+.qandaset table {
+	border-collapse: collapse;
+}
+.qandaset {
+}
+.qandaset tr.question {
+}
+.qandaset tr.question td {
+	font-weight: bold;
+	padding: 0 0.5em;
+	margin: 0;
+}
+.qandaset tr.answer td {
+	padding: 0 0.5em 1.5em;
+	margin: 0;
+}
+.qandaset tr.question td, .qandaset tr.answer td {
+	vertical-align: top;
+}
+.qandaset strong {
+	text-align: right;
+}
+
+.article .table table {
+	border: 0;
+	margin: 0 auto;
+	border-collapse: collapse;
+}
+.article .table table th {
+	padding: 5px;
+	text-align: center;
+}
diff --git a/roles/planet/files/sub-planets/edited/css/layout.css b/roles/planet/files/sub-planets/edited/css/layout.css
new file mode 100644
index 0000000000..6ceba83ce0
--- /dev/null
+++ b/roles/planet/files/sub-planets/edited/css/layout.css
@@ -0,0 +1,362 @@
+	body {
+	font-size: 0.9em;
+	font-family: bitstream vera sans,sans-serif;
+	margin: 0;
+	padding: 0;
+	/* (The background color is specified elsewhere, so do a global replacement if it ever changes) */
+	background-color: #d9d9d9;
+}
+
+a:link {
+	color: #900;
+}
+a:visited {
+	color: #48468f;
+}
+a:hover {
+	color: #f20;
+}
+a[name] {
+	color: inherit;
+	text-decoration: inherit;
+}
+
+#fedora-header {
+	background-color: #fff;
+	height: 62px;
+}
+#fedora-header img {
+	border: 0;
+	vertical-align: middle;
+}
+#fedora-header-logo {
+	/* position is offset by the header padding amount */
+	position: absolute;
+	left: 26px;
+	top: 13px;
+	z-index: 3;
+}
+#fedora-header-logo img {
+	width: 110px;
+	height: 40;
+}
+#fedora-header-items {
+	/* position is offset by the header padding amount */
+	position: absolute;
+	right: 10px;
+	top: 15px;
+	text-align: right;
+	display: inline;
+}
+#fedora-header-items a {
+	color: #000;
+	text-decoration: none;
+	padding: 7pt;
+	font-size: 0.8em;
+}
+#fedora-header-items a:hover, #fedora-header-search-button:hover {
+	color: #f20;
+	cursor: pointer;
+}
+#fedora-header-items img {
+	margin-right: 1px;
+	width: 36px;
+	height: 36px;
+}
+#fedora-header-search {
+	height: 25px;
+}
+#fedora-header-search-entry {
+	vertical-align: top;
+	margin: 0.65em 4px 0 10px;
+	padding: 2px 4px;
+	background-color: #f5f5f5;
+	border: 1px solid #999;
+	font-size: 0.8em !important;
+}
+#fedora-header-search-entry:focus {
+	background-color: #fff;
+	border: 1px solid #555;
+}
+#fedora-header-search-button {
+	font-size: 0.8em !important;
+	vertical-align: top;
+	margin-top: 0.2em;
+	border: 0;
+	padding: 7px;
+	background: #fff url('../images/header-search.png') no-repeat left;
+	padding-left: 21px;
+}
+#fedora-header-items form {
+	float: right;
+}
+#fedora-header-items input {
+	font-size: 0.85em;
+}
+#fedora-nav {
+	margin: 0;
+	padding: 0;
+	background-color: #22437f;
+	font-size: 0;
+	height: 5px;
+	border-top: 1px solid #000;
+	border-bottom: 1px solid #f5f5f5;
+}
+#fedora-nav ul {
+	margin: 0;
+	padding: 0;
+}
+#fedora-nav li {
+	display: inline;
+	list-style: none;
+	padding: 0 5pt;
+}
+#fedora-nav li + li {
+	padding-left: 8pt;
+	border-left: 1px solid #99a5bf;
+}
+#fedora-nav a {
+	color: #c5ccdb;
+	text-decoration: none;
+}
+#fedora-nav a:hover {
+	color: #fff;
+}
+
+#fedora-side-left {
+	position: absolute;
+	z-index: 2;
+	width: 11em; 
+	/* Space down for the approx line height (fonts) */
+	left: 12px;
+}
+#fedora-side-right {
+	position: absolute;
+	z-index: 1;
+	width: 20em;
+	right: 12px;
+	padding-top: 3px;
+	}
+#fedora-side-left, #fedora-side-right {
+	top: 2px;
+	/* add to the top margin to compensate for the fixed sizes */
+	margin-top: 75px;
+	color: #555;
+	font-size: 0.9em;
+}
+#fedora-side-right ul {
+	list-style: square inside;
+	padding: 0;
+	margin: 0;
+}
+
+/* Left-side naviagation */
+#fedora-side-nav-label {
+	display: none;
+}
+#fedora-side-nav {
+	list-style: none;
+	margin: 0;
+	padding: 0;
+	border: 1px solid #5976b2;
+	border-top: 0;
+	background-color: #22437f;
+}
+#fedora-side-nav li {
+	margin: 0;
+	padding: 0;
+	border-top: 1px solid #5976b2;
+	/* IE/Win gets upset if there is no bottom border... Go figure. */
+	border-bottom: 1px solid #22437f;
+}
+#fedora-side-nav a {
+	margin: 0;
+	color: #c5ccdb;
+	display: block;
+	text-decoration: none;
+	padding: 4px 6px;
+}
+#fedora-side-nav a:hover {
+	background-color: #34548f;
+	color: #fff;
+}
+#fedora-side-nav ul {
+	list-style: none;
+	margin: 0;
+	padding: 0;
+}
+#fedora-side-nav ul li {
+	border-top: 1px solid #34548e;
+	background-color: #34548e;
+	/* IE/Win gets upset if there is no bottom border... Go figure. */
+	border-bottom: 1px solid #34548e;
+}
+#fedora-side-nav ul li:hover {
+	border-bottom: 1px solid #34548f;
+}
+#fedora-side-nav ul li a {
+	padding-left: 12px;
+	color: #a7b2c9;
+}
+#fedora-side-nav ul li a:hover {
+	background-color: #46659e;
+}
+#fedora-side-nav ul ul li a {
+	padding-left: 18px;
+}
+#fedora-side-nav strong a {
+	font-weight: normal;
+	color: #fff !important;
+	background-color: #10203b;
+}
+#fedora-side-nav strong a:hover {
+	background-color: #172e56 !important;
+}
+
+/* content containers */
+#fedora-middle-one, #fedora-middle-two, #fedora-middle-three {
+	font-size: 0.9em;
+	/* position: relative; */ /* relative to utilize z-index */
+	width: auto;
+	min-width: 120px;
+	margin: 10px;
+	z-index: 3; /* content can overlap when the browser is narrow */
+}
+/*
+#fedora-middle-two, #fedora-middle-three {
+	margin-left: 11em;
+	padding-left: 24px;
+}
+*/
+#fedora-middle-three {
+	margin-right: 20em;
+	padding-right: 24px;
+}
+
+#fedora-content {
+	padding: 24px;
+	border: 1px solid #aaa;
+	background-color: #fff;
+}
+
+#fedora-content > .fedora-corner-bottom { top: 0 }
+
+.fedora-corner-tl, .fedora-corner-tr, .fedora-corner-bl, .fedora-corner-br {
+	background-color: #d9d9d9;
+	position: relative;
+	width: 19px;
+	height: 19px;
+	/* The following line is to render PNGs with alpha transparency within IE/Win, using DirectX */
+	/* Work-around for IE6/Mac borkage (Part 1) */
+	display: none;
+}
+
+.fedora-corner-tl, .fedora-corner-bl { float: left; left: 0px; }
+.fedora-corner-tr, .fedora-corner-br { float: right; right: 0px; }
+.fedora-corner-tl, .fedora-corner-tr { top: 0px; }
+.fedora-corner-bl, .fedora-corner-br { bottom: 0px; margin-top: -19px; }
+
+
+html>body .fedora-corner-tl { background: #d9d9d9 url("../images/corner-tl.png") no-repeat left top; }
+html>body .fedora-corner-tr { background: #d9d9d9 url("../images/corner-tr.png") no-repeat right top; }
+html>body .fedora-corner-bl { background: #d9d9d9 url("../images/corner-bl.png") no-repeat left bottom; }
+html>body .fedora-corner-br { background: #d9d9d9 url("../images/corner-br.png") no-repeat right bottom; }
+
+.fedora-corner-tl { filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/corner-tl.png',sizingMethod='scale'); }
+.fedora-corner-tr { filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/corner-tr.png',sizingMethod='scale'); }
+.fedora-corner-br { filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/corner-br.png',sizingMethod='scale'); }
+.fedora-corner-bl { filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/corner-bl.png',sizingMethod='scale'); }
+
+/* \*/
+.fedora-corner-tl, .fedora-corner-tr, .fedora-corner-bl, .fedora-corner-br {
+	/* Restore the view for everything but IE6/Mac (part 2 of the "IE/Mac fix") */
+	display: block;
+}
+/* */
+
+html*.fedora-corner-bl, html*.fedora-corner-br {
+	/* Compensate for Opera's inability to position some things correctly (Part 2) */
+	top: 0px;
+}
+
+.content { margin: 0 1em }
+
+#fedora-sidelist {
+	position: relative;
+	bottom: 3px;
+	margin: 0;
+	padding: 3px !important;
+	border: 1px solid #bbb;
+	background-color: #ccc;
+	border-radius: 2.5px;
+	-moz-border-radius: 2.5px;
+}
+#fedora-sidelist strong a {
+	font-weight: normal;
+	background-color: #555;
+	color: #fff;
+}
+#fedora-sidelist strong a:hover {
+	background-color: #333;
+	color: #fff;
+}
+#fedora-sidelist li {
+	list-style-position: outside;
+	font-size: 0.9em;
+	list-style: none;
+	border: 1px solid #ccc;
+	border-width: 1px 0;
+	padding: 0;
+	list-style: none;
+}
+#fedora-sidelist li a {
+	text-decoration: none;
+	display: block;
+	padding: 6px 8px;
+	border-radius: 2.5px;
+	-moz-border-radius: 2.5px;
+}
+#fedora-sidelist li a:hover {
+	background-color: #999;
+	color: #eee;
+}
+
+#fedora-footer {
+	font-size: 0.75em;
+	text-align: center;
+	color: #777;
+	margin-bottom: 2em;
+}
+#fedora-printable {
+	text-align: center;
+	margin: 1em 0;
+	font-size: 0.85em;
+}
+#fedora-printable a {
+	text-decoration: none;
+	padding: 5px 0;
+	padding-left: 18px;
+	background: transparent url("../images/printable.png") no-repeat left;
+}
+#fedora-printable a:hover {
+	text-decoration: underline;
+}
+
+
+.left {
+	margin: 10px;
+	padding: 0px;
+	float: left;
+}
+
+.right {
+	margin: 10px;
+	padding: 0px;
+	float: right;
+}
+
+
+.blosxomStory p {
+	margin-top: 7px;
+	margin-bottom: 7px;
+}
\ No newline at end of file
diff --git a/roles/planet/files/sub-planets/edited/css/people-style.css b/roles/planet/files/sub-planets/edited/css/people-style.css
new file mode 100644
index 0000000000..9f95fc7535
--- /dev/null
+++ b/roles/planet/files/sub-planets/edited/css/people-style.css
@@ -0,0 +1,169 @@
+html, body {
+	border: 0;
+	padding: 0;
+	margin: 0;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	min-width: 912px;
+	background-color: #eeeff1;
+}
+#header {
+	margin-bottom: 23px; /* sync this value with margin-top of #content */
+	background: #2963a5 url("../images/people-header.png") repeat-y 20% 0%;
+	height: 74px;
+}
+#header .logo {
+	position: absolute;
+	display: block;
+	left: 5px;
+	top: 3px;
+}
+#content {
+	margin-top: -23px;  /* sync this value with margin-top of #content */
+	margin-right: 210px;
+	background-color: white;
+}
+.blog-entries-daily {
+	background: white url("../images/people-entry-group-date-header.png") no-repeat top right;
+	margin-right: 25px;
+	position: relative;
+	padding-bottom: 12px;
+	margin-bottom: 30px;
+}
+.blog-date {
+	text-align: center;
+	background: transparent url("../images/people-entry-group-date-background.png") repeat-y top right;
+	color: white;
+	margin-top: 11px;
+	position: absolute;
+	right: 0;
+	font-size: 0.9em;
+	width: 229px;
+	height: 100%;
+}
+.blog-entry {
+	clear: both;
+	margin: 11px 0;
+	position: relative;
+	top: 40px;
+}
+.blog-entry-author {
+	float: left;
+	margin-top: 30px;
+	padding: 0 20px 30px 0;
+	width: 125px;
+	font-size: 0.8em;
+	text-align: center;
+}
+.blog-entry-author :link, .blog-entry-author :visited {
+	font-size: 0.9em;
+}
+.blog-entry-author .head {
+	display: block;
+	margin: 1ex auto;
+	border: 0;
+}
+.blog-entry-post {
+	margin: 1em 0 1em 145px;
+	border-radius: 20px;
+	background: transparent url("../images/people-entry-center-left.png") repeat-y center left;
+}
+.blog-entry-header {
+	background: transparent url("../images/people-entry-top-center.png") repeat-x top center;
+	height: 50px;
+}
+.blog-entry-title {
+	font-size: larger;
+	background: transparent url("../images/people-entry-top-left.png") no-repeat top left;
+	height: 50px;
+}
+.blog-entry-title a {
+	padding: 1em 0;
+	display: block;
+	margin-left: 25px;
+	background: transparent url("../images/people-entry-top-right.png") no-repeat top right;
+	height: 50px;
+}
+.blog-entry-content {
+	padding-top:10px;
+	padding-right: 3em;
+	margin-left: 25px;
+	text-align: justify;
+	font-size: 0.8em;
+	font-weight: normal;
+	background: transparent url("../images/people-entry-center-right.png") repeat-y center right;
+	padding-bottom:10px;
+	position: relative;
+	overflow: auto;
+}
+.blog-entry-content img {
+	max-width: 575px;
+	margin-left: 2ex;
+}
+.blog-entry-footer {
+	background: transparent url("../images/people-entry-bottom-center.png") repeat-x bottom center;
+}
+.blog-entry-timestamp {
+	font-size: x-small;
+	text-align: right;
+	color: #b3b3b3;
+	background: transparent url("../images/people-entry-bottom-left.png") no-repeat bottom left;
+}
+.blog-entry-timestamp a {
+	display: block;
+	color: #b3b3b3;
+	text-decoration: none;
+	height: 35px;
+	background: transparent url("../images/people-entry-bottom-right.png") no-repeat bottom right;
+	padding: 1em 5em 0 0;
+}
+#disclaimer {
+	font-size: x-small;
+	color: #b3b3b3;
+	text-align: center;
+	padding: 1em;
+}
+#sidebar {
+	color: #555555;
+	background-color: #eeeff1;
+	font-size: 0.8em;
+	position: absolute;
+	width: 210px;
+	min-width: 210px;
+	max-width: 210px;
+	top: 0;
+	right: 0;
+	margin: 0;
+	border-left: 2px solid white;
+	height: 100%;
+}
+#sidebar #sidebar-header {
+	display: block;
+	background-color: #2963a5;
+}
+#sidebar-inner {
+	padding: 10px;
+}
+#sidebar h2 {
+	font-size: 1.4em;
+	font-weight: normal;
+	border-bottom: 1px solid #cfd4d9;
+	margin: 5px 0px;
+	padding: 0px 5px;
+}
+
+#sidebar ul {
+	list-style: square inside;
+	padding: 0;
+	margin: 0 0 1em 0;
+	color: #22538b;
+}
+#spacer {
+	height: 1em;
+}
+:link {
+	color: #337ACC;
+}
+:visited {
+	color: #6A3B18;
+}
+
diff --git a/roles/planet/files/sub-planets/edited/css/print.css b/roles/planet/files/sub-planets/edited/css/print.css
new file mode 100644
index 0000000000..0be9beab70
--- /dev/null
+++ b/roles/planet/files/sub-planets/edited/css/print.css
@@ -0,0 +1,86 @@
+body {
+	background: white;
+	color: black;
+	font-size: 10pt;
+	font-family: sans-serif;
+	line-height: 1.25em;
+}
+
+div {
+	border: 1px solid white;
+}
+li {
+	border: 1px solid white;
+	margin: 0;
+}
+li p {
+	display: inline;
+}
+
+h1 {
+	font-size: 16pt;
+}
+h2 {
+	font-size: 12pt;
+}
+h3,h4,h5 {
+	font-size: 10pt;
+}
+img {
+	border: 1px solid white;
+	background-color: white;
+}
+hr {
+	border: 1px dotted gray;
+	border-width: 0 0 1 0;
+	margin: 1em;
+}
+table {
+	border-collapse: collapse;
+}
+td,th {
+	border: 1px solid gray;
+	padding: 8pt;
+	font-size: 10pt;
+}
+th {
+	font-weight: bold;
+}
+#fedora-header, #fedora-footer {
+	text-align: center;
+}
+#fedora-header-items, #fedora-side-left, #fedora-side-right {
+	display: none;
+}
+
+#fedora-project-download dt {
+	font-weight: bold;
+	margin-top: 8pt;
+	margin-left: 5pt;
+}
+#fedora-project-download dd {
+	padding: 0;
+	margin: 10px 20px 0;
+}
+
+code.screen, pre.screen {
+	font-family: monospace;
+	font-size: 1em;
+	display: block;
+	padding: 5pt;
+	border: 1px dashed gray;
+	margin: 0.5em 2em;
+}
+#fedora-project code.screen {
+	margin: 0;
+}
+
+/*
+#fedora-content a:link:after, #fedora-content a:visited:after {
+	content: " (" attr(href) ") ";
+	font-size: 80%;
+}
+*/
+.navheader table, .navheader table td {
+	border: 0 !important;
+}
diff --git a/roles/planet/files/sub-planets/edited/fpbuilder.conf b/roles/planet/files/sub-planets/edited/fpbuilder.conf
new file mode 100644
index 0000000000..84df35248a
--- /dev/null
+++ b/roles/planet/files/sub-planets/edited/fpbuilder.conf
@@ -0,0 +1,5 @@
+[main]
+base_config=/etc/planet/edited/base_config
+output=/srv/planet/site/edited/planet.ini
+group=edited
+
diff --git a/roles/planet/files/sub-planets/edited/images/blue.png b/roles/planet/files/sub-planets/edited/images/blue.png
new file mode 100644
index 0000000000..6987cab624
Binary files /dev/null and b/roles/planet/files/sub-planets/edited/images/blue.png differ
diff --git a/roles/planet/files/sub-planets/edited/images/corner-bl.png b/roles/planet/files/sub-planets/edited/images/corner-bl.png
new file mode 100644
index 0000000000..58d269c306
Binary files /dev/null and b/roles/planet/files/sub-planets/edited/images/corner-bl.png differ
diff --git a/roles/planet/files/sub-planets/edited/images/corner-br.png b/roles/planet/files/sub-planets/edited/images/corner-br.png
new file mode 100644
index 0000000000..c03dd92bec
Binary files /dev/null and b/roles/planet/files/sub-planets/edited/images/corner-br.png differ
diff --git a/roles/planet/files/sub-planets/edited/images/corner-tl.png b/roles/planet/files/sub-planets/edited/images/corner-tl.png
new file mode 100644
index 0000000000..08ab7a3ac2
Binary files /dev/null and b/roles/planet/files/sub-planets/edited/images/corner-tl.png differ
diff --git a/roles/planet/files/sub-planets/edited/images/corner-tr.png b/roles/planet/files/sub-planets/edited/images/corner-tr.png
new file mode 100644
index 0000000000..b279db2961
Binary files /dev/null and b/roles/planet/files/sub-planets/edited/images/corner-tr.png differ
diff --git a/roles/planet/files/sub-planets/edited/images/favicon.ico b/roles/planet/files/sub-planets/edited/images/favicon.ico
new file mode 100644
index 0000000000..d1ae2d209a
Binary files /dev/null and b/roles/planet/files/sub-planets/edited/images/favicon.ico differ
diff --git a/roles/planet/files/sub-planets/edited/images/header-download.png b/roles/planet/files/sub-planets/edited/images/header-download.png
new file mode 100644
index 0000000000..a1cf3e577e
Binary files /dev/null and b/roles/planet/files/sub-planets/edited/images/header-download.png differ
diff --git a/roles/planet/files/sub-planets/edited/images/header-faq.png b/roles/planet/files/sub-planets/edited/images/header-faq.png
new file mode 100644
index 0000000000..1e7c3c95d3
Binary files /dev/null and b/roles/planet/files/sub-planets/edited/images/header-faq.png differ
diff --git a/roles/planet/files/sub-planets/edited/images/header-fedora_logo.png b/roles/planet/files/sub-planets/edited/images/header-fedora_logo.png
new file mode 100644
index 0000000000..552f201643
Binary files /dev/null and b/roles/planet/files/sub-planets/edited/images/header-fedora_logo.png differ
diff --git a/roles/planet/files/sub-planets/edited/images/header-projects.png b/roles/planet/files/sub-planets/edited/images/header-projects.png
new file mode 100644
index 0000000000..aad307edd2
Binary files /dev/null and b/roles/planet/files/sub-planets/edited/images/header-projects.png differ
diff --git a/roles/planet/files/sub-planets/edited/images/heads/default.png b/roles/planet/files/sub-planets/edited/images/heads/default.png
new file mode 100644
index 0000000000..407185b503
Binary files /dev/null and b/roles/planet/files/sub-planets/edited/images/heads/default.png differ
diff --git a/roles/planet/files/sub-planets/edited/images/intro-computer.png b/roles/planet/files/sub-planets/edited/images/intro-computer.png
new file mode 100644
index 0000000000..9298aecea3
Binary files /dev/null and b/roles/planet/files/sub-planets/edited/images/intro-computer.png differ
diff --git a/roles/planet/files/sub-planets/edited/images/intro-download.png b/roles/planet/files/sub-planets/edited/images/intro-download.png
new file mode 100644
index 0000000000..c77db0be2d
Binary files /dev/null and b/roles/planet/files/sub-planets/edited/images/intro-download.png differ
diff --git a/roles/planet/files/sub-planets/edited/images/logo-spacer.png b/roles/planet/files/sub-planets/edited/images/logo-spacer.png
new file mode 100644
index 0000000000..a104f5535f
Binary files /dev/null and b/roles/planet/files/sub-planets/edited/images/logo-spacer.png differ
diff --git a/roles/planet/files/sub-planets/edited/images/logo.png b/roles/planet/files/sub-planets/edited/images/logo.png
new file mode 100644
index 0000000000..f277bf9281
Binary files /dev/null and b/roles/planet/files/sub-planets/edited/images/logo.png differ
diff --git a/roles/planet/files/sub-planets/edited/images/mainBack.png b/roles/planet/files/sub-planets/edited/images/mainBack.png
new file mode 100644
index 0000000000..1372780be6
Binary files /dev/null and b/roles/planet/files/sub-planets/edited/images/mainBack.png differ
diff --git a/roles/planet/files/sub-planets/edited/images/people-entry-bottom-center.png b/roles/planet/files/sub-planets/edited/images/people-entry-bottom-center.png
new file mode 100644
index 0000000000..8d8ee6ace4
Binary files /dev/null and b/roles/planet/files/sub-planets/edited/images/people-entry-bottom-center.png differ
diff --git a/roles/planet/files/sub-planets/edited/images/people-entry-bottom-left.png b/roles/planet/files/sub-planets/edited/images/people-entry-bottom-left.png
new file mode 100644
index 0000000000..1aadc48c53
Binary files /dev/null and b/roles/planet/files/sub-planets/edited/images/people-entry-bottom-left.png differ
diff --git a/roles/planet/files/sub-planets/edited/images/people-entry-bottom-right.png b/roles/planet/files/sub-planets/edited/images/people-entry-bottom-right.png
new file mode 100644
index 0000000000..047c9081f9
Binary files /dev/null and b/roles/planet/files/sub-planets/edited/images/people-entry-bottom-right.png differ
diff --git a/roles/planet/files/sub-planets/edited/images/people-entry-center-left.png b/roles/planet/files/sub-planets/edited/images/people-entry-center-left.png
new file mode 100644
index 0000000000..9da8d17866
Binary files /dev/null and b/roles/planet/files/sub-planets/edited/images/people-entry-center-left.png differ
diff --git a/roles/planet/files/sub-planets/edited/images/people-entry-center-right.png b/roles/planet/files/sub-planets/edited/images/people-entry-center-right.png
new file mode 100644
index 0000000000..379c8c0671
Binary files /dev/null and b/roles/planet/files/sub-planets/edited/images/people-entry-center-right.png differ
diff --git a/roles/planet/files/sub-planets/edited/images/people-entry-group-date-background.png b/roles/planet/files/sub-planets/edited/images/people-entry-group-date-background.png
new file mode 100644
index 0000000000..f029a675a4
Binary files /dev/null and b/roles/planet/files/sub-planets/edited/images/people-entry-group-date-background.png differ
diff --git a/roles/planet/files/sub-planets/edited/images/people-entry-group-date-header.png b/roles/planet/files/sub-planets/edited/images/people-entry-group-date-header.png
new file mode 100644
index 0000000000..47ee607a41
Binary files /dev/null and b/roles/planet/files/sub-planets/edited/images/people-entry-group-date-header.png differ
diff --git a/roles/planet/files/sub-planets/edited/images/people-entry-top-center.png b/roles/planet/files/sub-planets/edited/images/people-entry-top-center.png
new file mode 100644
index 0000000000..6b3b33aebf
Binary files /dev/null and b/roles/planet/files/sub-planets/edited/images/people-entry-top-center.png differ
diff --git a/roles/planet/files/sub-planets/edited/images/people-entry-top-left.png b/roles/planet/files/sub-planets/edited/images/people-entry-top-left.png
new file mode 100644
index 0000000000..007a1e2850
Binary files /dev/null and b/roles/planet/files/sub-planets/edited/images/people-entry-top-left.png differ
diff --git a/roles/planet/files/sub-planets/edited/images/people-entry-top-right.png b/roles/planet/files/sub-planets/edited/images/people-entry-top-right.png
new file mode 100644
index 0000000000..bfb41fb2a2
Binary files /dev/null and b/roles/planet/files/sub-planets/edited/images/people-entry-top-right.png differ
diff --git a/roles/planet/files/sub-planets/edited/images/people-header.png b/roles/planet/files/sub-planets/edited/images/people-header.png
new file mode 100644
index 0000000000..d1fcbbc3c1
Binary files /dev/null and b/roles/planet/files/sub-planets/edited/images/people-header.png differ
diff --git a/roles/planet/files/sub-planets/edited/images/people-logo.png b/roles/planet/files/sub-planets/edited/images/people-logo.png
new file mode 100644
index 0000000000..6404e088f1
Binary files /dev/null and b/roles/planet/files/sub-planets/edited/images/people-logo.png differ
diff --git a/roles/planet/files/sub-planets/edited/images/people-sidebar-header.png b/roles/planet/files/sub-planets/edited/images/people-sidebar-header.png
new file mode 100644
index 0000000000..c82025672e
Binary files /dev/null and b/roles/planet/files/sub-planets/edited/images/people-sidebar-header.png differ
diff --git a/roles/planet/files/sub-planets/edited/images/planet.png b/roles/planet/files/sub-planets/edited/images/planet.png
new file mode 100644
index 0000000000..9606a0c30d
Binary files /dev/null and b/roles/planet/files/sub-planets/edited/images/planet.png differ
diff --git a/roles/planet/files/sub-planets/edited/images/rss.png b/roles/planet/files/sub-planets/edited/images/rss.png
new file mode 100644
index 0000000000..4a1e1b1cfd
Binary files /dev/null and b/roles/planet/files/sub-planets/edited/images/rss.png differ
diff --git a/roles/planet/files/sub-planets/edited/planet-group.cron b/roles/planet/files/sub-planets/edited/planet-group.cron
new file mode 100644
index 0000000000..e01498cefc
--- /dev/null
+++ b/roles/planet/files/sub-planets/edited/planet-group.cron
@@ -0,0 +1,2 @@
+*/20 * * * * planet-user bash /usr/local/bin/pull-run-planet-config.sh /etc/planet/edited/fpbuilder.conf >>/dev/null 2>&1
+10 4 * * * *  planet-user /usr/sbin/tmpwatch 360 /srv/planet/config/edited/cache >>/dev/null
\ No newline at end of file
diff --git a/roles/planet/files/sub-planets/edited/templates/atom.xml.tmpl b/roles/planet/files/sub-planets/edited/templates/atom.xml.tmpl
new file mode 100644
index 0000000000..de097c8bbf
--- /dev/null
+++ b/roles/planet/files/sub-planets/edited/templates/atom.xml.tmpl
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+
+	<title><TMPL_VAR name></title>
+	<link rel="self" href="<TMPL_VAR feed ESCAPE="HTML">"/>
+	<link href="<TMPL_VAR link ESCAPE="HTML">"/>
+	<id><TMPL_VAR feed ESCAPE="HTML"></id>
+	<updated><TMPL_VAR date_iso></updated>
+	<generator uri="http://planet.fedoraproject.org/edited/"><TMPL_VAR generator ESCAPE="HTML"></generator>
+
+<TMPL_LOOP Items>
+	<entry<TMPL_IF channel_language> xml:lang="<TMPL_VAR channel_language>"</TMPL_IF>>
+		<title type="html"<TMPL_IF title_language> xml:lang="<TMPL_VAR title_language>"</TMPL_IF>><TMPL_VAR title ESCAPE="HTML"></title>
+		<link href="<TMPL_VAR link ESCAPE="HTML">"/>
+		<id><TMPL_VAR id ESCAPE="HTML"></id>
+		<updated><TMPL_VAR date_iso></updated>
+		<content type="html"<TMPL_IF content_language> xml:lang="<TMPL_VAR content_language>"</TMPL_IF>>
+                <TMPL_IF channel_face>
+			&lt;img src=&quot;<TMPL_VAR channel_face ESCAPE="HTML">&quot; <TMPL_IF channel_facewidth>width=&quot;<TMPL_VAR channel_facewidth>&quot; </TMPL_IF><TMPL_IF channel_faceheight>height=&quot;<TMPL_VAR channel_faceheight>&quot; </TMPL_IF> alt=&quot;&quot; style=&quot;float: right;&quot;&gt;
+		</TMPL_IF> <TMPL_VAR content ESCAPE="HTML"></content>
+		<author>
+<TMPL_IF author_name>
+			<name><TMPL_VAR author_name ESCAPE="HTML"></name>
+<TMPL_IF author_email>
+			<email><TMPL_VAR author_email ESCAPE="HTML"></email>
+</TMPL_IF author_email>
+<TMPL_ELSE>
+<TMPL_IF channel_author_name>
+			<name><TMPL_VAR channel_author_name ESCAPE="HTML"></name>
+<TMPL_IF channel_author_email>
+			<email><TMPL_VAR channel_author_email ESCAPE="HTML"></email>
+</TMPL_IF channel_author_email>
+<TMPL_ELSE>
+			<name><TMPL_VAR channel_name ESCAPE="HTML"></name>
+</TMPL_IF>
+</TMPL_IF>
+			<uri><TMPL_VAR channel_link ESCAPE="HTML"></uri>
+		</author>
+		<source>
+<TMPL_IF channel_title>
+			<title type="html"><TMPL_VAR channel_title ESCAPE="HTML"></title>
+<TMPL_ELSE>
+			<title type="html"><TMPL_VAR channel_name ESCAPE="HTML"></title>
+</TMPL_IF>
+<TMPL_IF channel_subtitle>
+			<subtitle type="html"><TMPL_VAR channel_subtitle ESCAPE="HTML"></subtitle>
+</TMPL_IF>
+			<link rel="self" href="<TMPL_VAR channel_url ESCAPE="HTML">"/>
+<TMPL_IF channel_id>
+			<id><TMPL_VAR channel_id ESCAPE="HTML"></id>
+<TMPL_ELSE>
+			<id><TMPL_VAR channel_url ESCAPE="HTML"></id>
+</TMPL_IF>
+<TMPL_IF channel_updated_iso>
+			<updated><TMPL_VAR channel_updated_iso></updated>
+</TMPL_IF>
+<TMPL_IF channel_rights>
+			<rights type="html"><TMPL_VAR channel_rights ESCAPE="HTML"></rights>
+</TMPL_IF>
+		</source>
+	</entry>
+
+</TMPL_LOOP>
+</feed>
diff --git a/roles/planet/files/sub-planets/edited/templates/foafroll.xml.tmpl b/roles/planet/files/sub-planets/edited/templates/foafroll.xml.tmpl
new file mode 100644
index 0000000000..b2cecf3548
--- /dev/null
+++ b/roles/planet/files/sub-planets/edited/templates/foafroll.xml.tmpl
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<rdf:RDF
+	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+	xmlns:foaf="http://xmlns.com/foaf/0.1/"
+	xmlns:rss="http://purl.org/rss/1.0/"
+	xmlns:dc="http://purl.org/dc/elements/1.1/"
+>
+<foaf:Group>
+	<foaf:name><TMPL_VAR name></foaf:name>
+	<foaf:homepage><TMPL_VAR link></foaf:homepage>
+	<rdfs:seeAlso rdf:resource="<TMPL_VAR uri ESCAPE="HTML">" />
+
+<TMPL_LOOP Channels>
+	<foaf:member>
+		<foaf:Agent>
+			<foaf:name><TMPL_VAR name></foaf:name>
+			<foaf:weblog>
+				<foaf:Document rdf:about="<TMPL_VAR link ESCAPE="HTML">">
+					<dc:title><TMPL_VAR title></dc:title>
+					<rdfs:seeAlso>
+						<rss:channel rdf:about="<TMPL_VAR uri ESCAPE="HTML">" />
+					</rdfs:seeAlso>
+				</foaf:Document>
+			</foaf:weblog>
+		</foaf:Agent>
+	</foaf:member>
+</TMPL_LOOP>
+
+</foaf:Group>
+</rdf:RDF>
diff --git a/roles/planet/files/sub-planets/edited/templates/heads.html.tmpl b/roles/planet/files/sub-planets/edited/templates/heads.html.tmpl
new file mode 100644
index 0000000000..a1636cc92a
--- /dev/null
+++ b/roles/planet/files/sub-planets/edited/templates/heads.html.tmpl
@@ -0,0 +1,97 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<title>Planet Fedora edited</title>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8">
+    <meta http-equiv="Content-Type" content="text/html">
+    <meta name="MSSmartTagsPreventParsing" content="TRUE">
+    <link rel="stylesheet" type="text/css" media="print" href="http://planet.fedoraproject.org/css/print.css">
+    <link rel="stylesheet" type="text/css" media="all" href="http://fedoraproject.org/static/css/fedora.css">
+    <link rel="stylesheet" type="text/css" media="all" href="/css/fedora_planet.css">
+    <link rel="shortcut icon" href="/images/favicon.ico">
+    <link rel="icon" href="/images/favicon.ico">
+    <style type="text/css">
+        #content ul {
+            overflow: auto;
+            list-style: none;
+        }
+        #content ul li {
+            height: 160px;
+            float: left;
+            text-align: center;
+            margin: 1em;
+        }
+        #content ul li img {
+            display: block;
+            margin: 0 auto;
+        }
+    </style>
+</head>
+<body class="home">
+    <div id="wrapper">
+
+        <div id="head">
+            <h1><a href="http://fedoraproject.org/">Fedora</a></h1>
+        </div>
+
+        <div id="sidebar">
+            <div id="planet_nav">
+
+                <h2>Feeds</h2>
+                <a href="rss10.xml">RSS 1.0</a><br>
+                <a href="rss20.xml">RSS 2.0</a><br>
+                <a href="atom.xml">Atom 1.0</a><br>
+                <a href="foafroll.xml">FOAF blogroll</a><br>
+
+                <h2>Links</h2>
+                <ul>
+                    <li><a href="http://fedoraproject.org">Fedora Home</a></li>
+                    <li><a href="http://fedoranews.org">Fedora News</a></li>
+                    <li><a href="http://planet.fedoraproject.org/heads/">Hackergotchi Heads</a></li>
+                    <li><a href="http://fedoraproject.org/infofeed/">Fedora Info</a></li>
+                </ul>
+
+                <h2>People</h2>
+                <ul id="people_feeds">
+
+                <TMPL_LOOP Channels>
+                    <li><a href="<TMPL_VAR url ESCAPE="HTML">"><img src="/images/rss.png" alt="RSS"></a><a href="<TMPL_VAR link>" title="<TMPL_VAR title>"><TMPL_VAR name></a></li>
+                </TMPL_LOOP>
+                </ul>
+
+                <h2>Add your blog</h2>
+                <ul><li><a href="http://fedoraproject.org/wiki/Planet_HowTo">Add your blog</a></li></ul>
+		<ul><li><div class="fedora_planet">"The content on this page is provided by Fedora contributors, and represents their individual viewpoints, and not necessarily those of the Fedora Project or any of its sponsors or other members."</div></a></li></ul>
+            </div>
+        </div>
+
+
+        <div id="content">
+            <div class="spacer">
+            </div> <!-- :-} -->
+<ul>
+<TMPL_LOOP Channels>
+<!--<li class="head"><TMPL_IF link><a href="<TMPL_VAR link>" title="<TMPL_VAR title>"></TMPL_IF><img src="<TMPL_VAR face ESCAPE="HTML">" <TMPL_IF facewidth>width="<TMPL_VAR facewidth>" </TMPL_IF><TMPL_IF faceheight>height="<TMPL_VAR faceheight>" </TMPL_IF>alt="" /><TMPL_VAR name><TMPL_IF link></a></TMPL_IF></li>-->
+<li class="head"><TMPL_IF link><a href="<TMPL_VAR link ESCAPE="HTML">" title="<TMPL_VAR title>"></TMPL_IF><img src="<TMPL_VAR face ESCAPE="HTML">" /><TMPL_VAR name><TMPL_IF link></a></TMPL_IF></li>
+</TMPL_LOOP>
+</ul>
+
+    </div>
+</div>
+    <div id="bottom">
+        <div id="footer">
+            <p class="copy">&copy; 2010 Red Hat, Inc. and others.  Please send any comments or corrections to the <a href="mailto:webmaster@fedoraproject.org">websites team</a>.</p>
+            <p class="disclaimer">The Fedora Project is maintained and driven by the community and sponsored by Red Hat.  This is a community maintained site.  Red Hat is not responsible for content.</p>
+            <p class="disclaimer">Your words are your own, duh. Nothing here represents Fedora™, Red Hat, Inc, or pretty much anything else. If you think it does then you are badly misled</p>
+            <ul>
+                <li class="first"><a href="/en/sponsors">Sponsors</a></li>
+                <li><a href="http://fedoraproject.org/wiki/Legal">Legal</a></li>
+                <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a></li>
+            </ul>
+        </div>
+    </div>
+
+
+</body>
+</html>
diff --git a/roles/planet/files/sub-planets/edited/templates/index.html.tmpl b/roles/planet/files/sub-planets/edited/templates/index.html.tmpl
new file mode 100644
index 0000000000..34b9db0fa7
--- /dev/null
+++ b/roles/planet/files/sub-planets/edited/templates/index.html.tmpl
@@ -0,0 +1,114 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<title>JustFedora Planet</title>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8">
+    <meta http-equiv="Content-Type" content="text/html">
+    <meta name="MSSmartTagsPreventParsing" content="TRUE">
+    <link rel="stylesheet" type="text/css" media="print" href="http://planet.fedoraproject.org/css/print.css">
+    <link rel="stylesheet" type="text/css" media="all" href="http://fedoraproject.org/static/css/fedora.css">
+    <link rel="stylesheet" type="text/css" media="all" href="/css/fedora_planet.css">
+    <link rel="shortcut icon" href="/images/favicon.ico">
+    <link rel="icon" href="/images/favicon.ico">
+    <link rel="alternate" type="application/xml" title="RSS" href="http://planet.fedoraproject.org/edited/rss20.xml">
+    <link rel="alternate" type="application/atom+xml" title="Fedora People Atom 1.0" href="http://planet.fedoraproject.org/edited/atom.xml">
+</head>
+<body class="home">
+    <div id="wrapper">
+
+        <div id="head">
+            <h1><a href="http://fedoraproject.org/">Fedora</a></h1>
+        </div>
+
+        <div id="sidebar">
+            <div id="planet_nav">
+
+                <h2>Feeds</h2>
+                <a href="rss10.xml">RSS 1.0</a><br>
+                <a href="rss20.xml">RSS 2.0</a><br>
+                <a href="atom.xml">Atom 1.0</a><br>
+                <a href="foafroll.xml">FOAF blogroll</a><br>
+
+                <h2>Links</h2>
+                <ul>
+                    <li><a href="http://fedoraproject.org">Fedora Home</a></li>
+                    <li><a href="http://fedoranews.org">Fedora News</a></li>
+                    <li><a href="http://fedoraproject.org/infofeed/">Fedora Info</a></li>
+                </ul>
+
+                <h2>People</h2>
+                <ul id="people_feeds">
+
+                <TMPL_LOOP Channels>
+                    <li><a href="<TMPL_VAR url ESCAPE="HTML">"><img src="images/rss.png" alt="RSS"></a><a href="<TMPL_VAR link ESCAPE="HTML">" title="<TMPL_VAR title ESCAPE="HTML">"><TMPL_VAR name ESCAPE="HTML"></a></li>
+                </TMPL_LOOP>
+                </ul>
+
+                <h2>Add your blog</h2>
+                <ul><li><a 
+href="http://fedoraproject.org/wiki/Planet_JustFedora">Add your 
+blog</a></li></ul>
+<ul><li><div class="fedora_planet">"The content on this page is provided by Fedora contributors, and represents their individual viewpoints, and not necessarily those of the Fedora Project or any of its sponsors or other members."</div></a></li></ul>        
+    </div>
+        </div>
+
+
+        <div id="content">
+            <div class="spacer">
+        <TMPL_LOOP Items>
+
+            <TMPL_IF new_date>
+            </div> <!-- :-} -->
+
+            <div class="blog-entries-daily">
+            <h2 class="blog-date"><TMPL_VAR new_date></h2>
+            </TMPL_IF>
+
+
+            <div class="blog-entry <TMPL_VAR channel_name>">
+                <div class="blog-entry-post">
+                    <div class="blog-entry-header">
+                        <div class="blog-entry-author">
+
+                            <TMPL_IF channel_face>
+                                <img src="<TMPL_VAR channel_face ESCAPE="HTML">" <TMPL_IF channel_facewidth>width="<TMPL_VAR channel_facewidth>" </TMPL_IF><TMPL_IF channel_faceheight>height="<TMPL_VAR channel_faceheight>" </TMPL_IF>alt="">
+                                <br><a href="<TMPL_VAR channel_link ESCAPE="HTML">"><TMPL_VAR channel_name></a>
+
+                            </TMPL_IF>
+
+                        </div>
+
+                        <div class="blog-entry-title"><a href="<TMPL_VAR link>"><TMPL_IF title><TMPL_VAR title><TMPL_ELSE>Untitled Post</TMPL_IF></a></div>
+                    </div>
+
+                    <div class="blog-entry-content-container">
+
+                        <div class="blog-entry-content"><TMPL_VAR content></div>
+
+                    </div>
+                    <div class="blog-entry-footer">
+                    <div class="blog-entry-timestamp"><a href="<TMPL_VAR link ESCAPE="HTML">"><TMPL_IF creator>by <TMPL_VAR creator> at </TMPL_IF><TMPL_VAR date></a></div>
+                    </div>
+                </div>
+            </div>
+    </TMPL_LOOP>
+        </div>
+    </div>
+</div>
+    <div id="bottom">
+        <div id="footer">
+            <p class="copy">&copy; 2010 Red Hat, Inc. and others.  Please send any comments or corrections to the <a href="mailto:webmaster@fedoraproject.org">websites team</a>.</p>
+            <p class="disclaimer">The Fedora Project is maintained and driven by the community and sponsored by Red Hat.  This is a community maintained site.  Red Hat is not responsible for content.</p>
+            <p class="disclaimer">Your words are your own, duh. Nothing here represents Fedora™, Red Hat, Inc, or pretty much anything else. If you think it does then you are badly misled</p>
+            <ul>
+                <li class="first"><a href="/en/sponsors">Sponsors</a></li>
+                <li><a href="http://fedoraproject.org/wiki/Legal">Legal</a></li>
+                <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a></li>
+            </ul>
+        </div>
+    </div>
+
+
+</body>
+</html>
diff --git a/roles/planet/files/sub-planets/edited/templates/opml.xml.tmpl b/roles/planet/files/sub-planets/edited/templates/opml.xml.tmpl
new file mode 100644
index 0000000000..aaa8833810
--- /dev/null
+++ b/roles/planet/files/sub-planets/edited/templates/opml.xml.tmpl
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<opml version="1.1">
+	<head>
+		<title><TMPL_VAR name></title>
+		<dateCreated><TMPL_VAR date_822></dateCreated>
+		<dateModified><TMPL_VAR date_822></dateModified>
+		<ownerName><TMPL_VAR owner_name></ownerName>
+		<ownerEmail><TMPL_VAR owner_email></ownerEmail>
+	</head>
+	
+	<body>
+		<TMPL_LOOP Channels>
+		<outline text="<TMPL_VAR name ESCAPE="HTML">" xmlUrl="<TMPL_VAR url ESCAPE="HTML">"/>
+		</TMPL_LOOP>
+	</body>
+</opml>
diff --git a/roles/planet/files/sub-planets/edited/templates/rss10.xml.tmpl b/roles/planet/files/sub-planets/edited/templates/rss10.xml.tmpl
new file mode 100644
index 0000000000..eec6de128c
--- /dev/null
+++ b/roles/planet/files/sub-planets/edited/templates/rss10.xml.tmpl
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<rdf:RDF
+	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	xmlns:dc="http://purl.org/dc/elements/1.1/"
+	xmlns:foaf="http://xmlns.com/foaf/0.1/"
+	xmlns:content="http://purl.org/rss/1.0/modules/content/"
+	xmlns="http://purl.org/rss/1.0/"
+>
+<channel rdf:about="<TMPL_VAR link ESCAPE="HTML">">
+	<title><TMPL_VAR name></title>
+    <link><TMPL_VAR link ESCAPE="HTML"></link>
+        <description>Fedora People: http://planet.fedoraproject.org/edited</description>
+	<items>
+		<rdf:Seq>
+<TMPL_LOOP Items>
+			<rdf:li rdf:resource="<TMPL_VAR id ESCAPE="HTML">" />
+</TMPL_LOOP>
+		</rdf:Seq>
+	</items>
+</channel>
+
+<TMPL_LOOP Items>
+<item rdf:about="<TMPL_VAR id ESCAPE="HTML">">
+	<title><TMPL_VAR channel_name><TMPL_IF title>: <TMPL_VAR title></TMPL_IF></title>
+    <link><TMPL_VAR link ESCAPE="HTML"></link>
+	<TMPL_IF content>
+	<content:encoded><TMPL_VAR content ESCAPE="HTML"></content:encoded>
+	</TMPL_IF>
+	<dc:date><TMPL_VAR date_iso></dc:date>
+</item>
+</TMPL_LOOP>
+
+</rdf:RDF>
diff --git a/roles/planet/files/sub-planets/edited/templates/rss20.xml.tmpl b/roles/planet/files/sub-planets/edited/templates/rss20.xml.tmpl
new file mode 100644
index 0000000000..b1312da149
--- /dev/null
+++ b/roles/planet/files/sub-planets/edited/templates/rss20.xml.tmpl
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
+<channel>
+   <atom:link href="http://planet.fedoraproject.org/edited/rss20.xml" rel="self" type="application/rss+xml" />
+	<title><TMPL_VAR name></title>
+	<link><TMPL_VAR link></link>
+	<language>en</language>
+        <description>Fedora People: http://planet.fedoraproject.org/edited</description>
+
+<TMPL_LOOP Items>
+<item>
+	<title><TMPL_VAR channel_name><TMPL_IF title>: <TMPL_VAR title></TMPL_IF></title>
+	<guid isPermaLink="false"><TMPL_VAR id ESCAPE="HTML"></guid>
+	<link><TMPL_VAR link ESCAPE="HTML"></link>
+	<TMPL_IF content>
+
+	<description>
+		<TMPL_IF channel_face>
+			&lt;img src=&quot;<TMPL_VAR channel_face ESCAPE="HTML">&quot; <TMPL_IF channel_facewidth>width=&quot;<TMPL_VAR channel_facewidth>&quot; </TMPL_IF><TMPL_IF channel_faceheight>height=&quot;<TMPL_VAR channel_faceheight>&quot; </TMPL_IF> alt=&quot;&quot; style=&quot;float: right;&quot;&gt;
+		</TMPL_IF>
+		<TMPL_VAR content ESCAPE="HTML"></description>
+	</TMPL_IF>
+	<pubDate><TMPL_VAR date_822></pubDate>
+</item>
+</TMPL_LOOP>
+
+</channel>
+</rss>
diff --git a/roles/planet/files/sub-planets/people/css/content.css b/roles/planet/files/sub-planets/people/css/content.css
new file mode 100644
index 0000000000..982924ee61
--- /dev/null
+++ b/roles/planet/files/sub-planets/people/css/content.css
@@ -0,0 +1,237 @@
+.name-project, .name-release, .name-version {
+}
+
+/* Front page H1 */
+#page-main h1 {
+	font-size: 1.35em;
+}
+
+#page-main h1.center {
+	text-align: center;
+}
+
+h1, h2, h3, h4 {
+	/*
+	font-style: italic;
+	*/
+	font-family: luxi sans,sans-serif;
+}
+h1 {
+	font-size: 1.75em;
+}
+
+h2 {
+	font-size: 1.25em;
+#	background-color: #eee;
+}
+
+h3 {
+	font-size: 1.1em;
+}
+
+hr {
+	border: 0;
+	border-bottom: 1px solid #ccc;
+}
+
+.fedora-side-right-content {
+	padding: 1 5px 1.5em;
+	font-size: 1em;
+}
+#fedora-side-right h1, #fedora-side-right h2, #fedora-side-right h3 {
+	margin: 0;
+	padding: 0 4pt 0;
+	font-size: 1em;
+	letter-spacing: 2pt;
+	border-bottom: 1px solid #bbb;
+}
+#fedora-side-right hr {
+	border-bottom: 1px solid #aaa;
+	margin: 0.5em 0;
+}
+
+table tr {
+	font-size: 0.9em; 
+}
+
+
+#link-offsite {
+}
+.link-offsite-notation {
+	font-size: 0.9em;
+	color: #777;
+	padding-left: 1pt;
+	text-decoration: none !important;
+}
+#fedora-content .link-offsite-notation {
+	color: #999;
+}
+#link-redhat {
+}
+#fedora-content #link-redhat {
+}
+#link-internal {
+}
+
+#fedora-content li {
+	padding: 1pt;
+}
+#fedora-content h1 {
+	margin-top: 0;
+}
+
+#fedora-content a img {
+	margin: 1px;
+	border: 0;
+}
+#fedora-content a:hover img {
+	margin: 0;
+	border: 1px solid #f00;
+}
+#fedora-content a img.noborder {
+	margin: 0;
+	border: 0;
+}
+#fedora-content a:hover img .noborder {
+	margin: 0;
+	border: 0;
+}
+
+#fedora-project-maintainers p, #fedora-project-contributors p, #fedora-project-bugs p {
+	margin-left: 5pt;
+}
+
+#fedora-project-download dt {
+	font-weight: bold;
+	margin-top: 8pt;
+	margin-left: 5pt;
+}
+#fedora-project-download dd {
+	padding: 0;
+	margin: 10px 20px 0;
+}
+#fedora-project-screenshots a img {
+	margin: 5px;
+}
+#fedora-project-screenshots a:hover img {
+	margin: 4px;
+}
+#fedora-project-todo ul {
+	border: 1px solid #cad4e9;
+	margin: 0 1em;
+	padding: 0;
+	list-style: none;
+	border-radius: 2.5px;
+	-moz-border-radius: 2.5px;
+}
+#fedora-project-todo li {
+	margin: 0;
+	padding: 6px 8px;
+}
+#fedora-project-todo li.odd {
+	background-color: #ecf0f7;
+}
+#fedora-project-todo li.even {
+	background-color: #f7f9fc;
+}
+
+#fedora-list-packages {
+	border-collapse: collapse;
+	border: 1px solid #cad4e9;
+	border-radius: 2.5px;
+	-moz-border-radius: 2.5px;
+}
+#fedora-list-packages tr.odd td {
+	background-color: #ecf0f7;
+}
+#fedora-list-packages tr.even td {
+	background-color: #f7f9fc;
+}
+#fedora-list-packages th,
+#fedora-list-packages td {
+	margin: 0;
+	padding: 6px 8px;
+}
+#fedora-list-packages td.column-2 {
+	text-align: center;
+}
+#fedora-list-packages th {
+	background-color: #cad4e9;
+	color: #000;
+	font-weight: bold;
+	text-align: center;
+
+}
+
+/* pre.screen is for DocBook HTML output */
+code.screen, pre.screen {
+	font-family: monospace;
+	font-size: 1em;
+	display: block;
+	padding: 10px;
+	border: 1px solid #bbb;
+	background-color: #eee;
+	color: #000;
+	overflow: auto;
+	border-radius: 2.5px;
+	-moz-border-radius: 2.5px;
+	margin: 0.5em 2em;
+}
+#fedora-project code.screen {
+	margin: 0;
+}
+
+code.command, code.filename {
+	font-family: monospace;
+}
+
+code.citetitle {
+	font-family: sans-serif;
+	font-style: italic;
+}
+
+strong.application {
+	font-weight: bold;
+}
+.indent {
+	margin: 0 2em;
+}
+.fedora-docs-nav {
+	text-align: center;
+	position: relative;
+	padding: 1em;
+	margin-top: 2em;
+	border-top: 1px solid #ccc;
+}
+.fedora-docs-nav a {
+	padding: 0 1em;
+}
+.fedora-docs-nav-left {
+	position: absolute;
+	left: 0;
+}
+.fedora-docs-nav-right {
+	position: absolute;
+	right: 0;
+}
+
+.fedoraEntry {
+
+padding-left: 10px;
+padding-right: 10px;
+padding-bottom: 10px;
+padding-top: 10px;
+border-bottom: 1px solid #ccc;
+}
+
+.fedoraStory {
+}
+
+.fedoraFace {
+	margin: 0 0 10px 10px;
+	float: right;
+}
+
+.fedoraTitle {
+	font-size: 1.25em;
+}
diff --git a/roles/planet/files/sub-planets/people/css/docbook.css b/roles/planet/files/sub-planets/people/css/docbook.css
new file mode 100644
index 0000000000..3181bce246
--- /dev/null
+++ b/roles/planet/files/sub-planets/people/css/docbook.css
@@ -0,0 +1,71 @@
+#fedora-content li p {
+	margin: 0.2em;
+}
+
+#fedora-content div.table table {
+	width: 95%;
+	background-color: #DCDCDC; 
+	color: #000000;
+	border-spacing: 0;
+}
+
+#fedora-content div.table table th {
+	border: 1px solid #A9A9A9;	
+	background-color: #A9A9A9;
+	color: #000000;
+}
+
+#fedora-content div.table table td {
+	border: 1px solid #A9A9A9; 
+	background-color: #DCDCDC;
+	color: #000000;
+	padding: 0.5em;
+	margin-bottom: 0.5em;
+	margin-top: 2px; 
+
+}
+
+div.note table, div.tip table, div.important table, div.caution table, div.warning table {
+	width: 95%;
+	border: 2px solid #B0C4DE;
+	background-color: #F0F8FF;
+	color: #000000;
+	/* padding inside table area */
+	padding: 0.5em;
+	margin-bottom: 0.5em;
+	margin-top: 0.5em;
+}
+
+/* "Just the FAQs, ma'm." */
+.qandaset table {
+	border-collapse: collapse;
+}
+.qandaset {
+}
+.qandaset tr.question {
+}
+.qandaset tr.question td {
+	font-weight: bold;
+	padding: 0 0.5em;
+	margin: 0;
+}
+.qandaset tr.answer td {
+	padding: 0 0.5em 1.5em;
+	margin: 0;
+}
+.qandaset tr.question td, .qandaset tr.answer td {
+	vertical-align: top;
+}
+.qandaset strong {
+	text-align: right;
+}
+
+.article .table table {
+	border: 0;
+	margin: 0 auto;
+	border-collapse: collapse;
+}
+.article .table table th {
+	padding: 5px;
+	text-align: center;
+}
diff --git a/roles/planet/files/sub-planets/people/css/fedora_planet.css b/roles/planet/files/sub-planets/people/css/fedora_planet.css
new file mode 100644
index 0000000000..96eabf85d5
--- /dev/null
+++ b/roles/planet/files/sub-planets/people/css/fedora_planet.css
@@ -0,0 +1,213 @@
+#planet_nav{
+  margin: 0 1.5ex;
+  padding: 0 1.5ex;
+}
+
+#planet_nav h2{
+  font-size: 0.9em;
+  border-bottom: 1px dotted #AAAAAA;
+  color: #444444;
+  margin: 2ex 0 1ex;
+  text-transform: uppercase;
+  font-weight: normal;
+}
+
+#planet_nav ul{
+  list-style: url(http://fedoraproject.org/static/images/arrow.png);
+  margin-left: 15px;
+}
+
+#planet_nav li{
+  margin: 0.25ex 1ex;
+  color: #777777;
+  font-size: 0.9em;
+}
+
+#planet_nav a{
+  font-weight: bold;
+  margin-right: 0.75ex;
+  color: #729FCF;
+  font-size: 1.1em;
+}
+
+ul#people_feeds {
+    white-space: nowrap;
+    list-style: none;
+    margin-left: -5px;
+}
+
+.blog-entries-daily {
+    background: white url("../images/people-entry-group-date-header.png") no-repeat top right;
+    margin-right: 25px;
+    position: relative;
+    padding-bottom: 12px;
+    margin-bottom: 30px;
+}
+
+.blog-date {
+    text-align: center;
+    background: transparent url("../images/people-entry-group-date-background.png") repeat-y top right;
+    color: #F0F4F4;
+    margin-top: 11px;
+    position: absolute;
+    right: 0;
+    /*letter-spacing: .2em;*/
+    width: 229px;
+    height: 100%;
+}
+
+.blog-entry {
+    margin: 11px 0;
+    position: relative;
+    top: 40px;
+}
+
+.blog-entry-author {
+    position: relative;
+    top: 0px;
+    left: 10px;
+    padding: 0 20px 0px 20px;
+    width: 225px;
+    font-size: 0.8em;
+    text-align: center;
+    border: 0px solid red;
+    float: right;
+}
+
+.blog-entry-author :link, .blog-entry-author :visited {
+}
+
+.blog-entry-author .head {
+    display: block;
+    margin: 1ex auto;
+    border: 0;
+}
+
+.blog-entry-author .head img {
+    max-height: 126px;
+    max-width: 126px;
+}
+
+.blog-entry-post {
+    margin: 1em 0 1em 5px;
+    border-radius: 20px;
+    background: transparent url("../images/people-entry-center-left.png") repeat-y center left;
+}
+
+.blog-entry-header {
+    background: transparent url("../images/people-entry-top-center.png") repeat-x top center;
+    height: 50px;
+    border: 0px solid blue;
+
+}
+
+.blog-entry-title {
+    font-size: larger;
+    background: transparent url("../images/people-entry-top-left.png") no-repeat top left;
+    height: 50px;
+}
+
+.blog-entry-title a {
+    padding: 1em 0;
+    display: block;
+    margin-left: 25px;
+    background: transparent url("../images/people-entry-top-right.png") no-repeat top right;
+    height: 50px;
+}
+
+.blog-entry-content-container{
+    background: transparent url("../images/people-entry-center-right.png") repeat-y center right;
+}
+
+.blog-entry-content {
+    padding-top:10px;
+    margin-left: 25px;
+    margin-right:200px;
+    text-align: justify;
+    padding-bottom:10px;
+    min-height: 155px;
+    font-size: 110%;
+}
+
+.blog-entry-content *
+{
+    /* 2008-07-17 - ricky - disabling this CSS in blog posts */
+    float: none!important;
+    clear: none!important;
+}
+
+.blog-entry-content img {
+    margin-left: 2ex;
+}
+
+.blog-entry-content pre {
+    font-size: 100%;
+}
+
+
+.blog-entry-footer {
+    background: transparent url("../images/people-entry-bottom-center.png") repeat-x bottom center;
+}
+
+.blog-entry-timestamp {
+    font-size: x-small;
+    text-align: right;
+    color: #b3b3b3;
+    background: transparent url("../images/people-entry-bottom-left.png") no-repeat bottom left;
+}
+
+.blog-entry-timestamp a {
+    display: block;
+    color: #b3b3b3;
+    text-decoration: none;
+    height: 35px;
+    background: transparent url("../images/people-entry-bottom-right.png") no-repeat bottom right;
+    padding: 1em 5em 0 0;
+}
+
+#disclaimer {
+    font-size: x-small;
+    color: #b3b3b3;
+    text-align: center;
+    padding: 1em;
+}
+
+#spacer {
+    height: 1em;
+}
+
+:link {
+    color: #337ACC;
+}
+:visited {
+    color: #6A3B18;
+}
+
+#content .blog-entries-daily h2 {
+  padding-top: 0px !important;
+}
+
+#content .blog-entry-title a {
+  padding-top: 20px !important;
+}
+
+#content .blog-entry-author img {
+  margin-top: 20px !important;
+  max-height: 126px;
+  max-width: 126px;
+}
+
+#content .fas-account {
+  margin-top: -20px !important;
+  padding-top: 0px !important;
+}
+
+#content .fas-account img {
+  padding-right: 3px;
+  vertical-align: bottom !important;
+}
+
+#content .author-name {
+  font-weight: 700 !important;
+  font-size: 11pt;
+}
diff --git a/roles/planet/files/sub-planets/people/css/layout.css b/roles/planet/files/sub-planets/people/css/layout.css
new file mode 100644
index 0000000000..6ceba83ce0
--- /dev/null
+++ b/roles/planet/files/sub-planets/people/css/layout.css
@@ -0,0 +1,362 @@
+	body {
+	font-size: 0.9em;
+	font-family: bitstream vera sans,sans-serif;
+	margin: 0;
+	padding: 0;
+	/* (The background color is specified elsewhere, so do a global replacement if it ever changes) */
+	background-color: #d9d9d9;
+}
+
+a:link {
+	color: #900;
+}
+a:visited {
+	color: #48468f;
+}
+a:hover {
+	color: #f20;
+}
+a[name] {
+	color: inherit;
+	text-decoration: inherit;
+}
+
+#fedora-header {
+	background-color: #fff;
+	height: 62px;
+}
+#fedora-header img {
+	border: 0;
+	vertical-align: middle;
+}
+#fedora-header-logo {
+	/* position is offset by the header padding amount */
+	position: absolute;
+	left: 26px;
+	top: 13px;
+	z-index: 3;
+}
+#fedora-header-logo img {
+	width: 110px;
+	height: 40;
+}
+#fedora-header-items {
+	/* position is offset by the header padding amount */
+	position: absolute;
+	right: 10px;
+	top: 15px;
+	text-align: right;
+	display: inline;
+}
+#fedora-header-items a {
+	color: #000;
+	text-decoration: none;
+	padding: 7pt;
+	font-size: 0.8em;
+}
+#fedora-header-items a:hover, #fedora-header-search-button:hover {
+	color: #f20;
+	cursor: pointer;
+}
+#fedora-header-items img {
+	margin-right: 1px;
+	width: 36px;
+	height: 36px;
+}
+#fedora-header-search {
+	height: 25px;
+}
+#fedora-header-search-entry {
+	vertical-align: top;
+	margin: 0.65em 4px 0 10px;
+	padding: 2px 4px;
+	background-color: #f5f5f5;
+	border: 1px solid #999;
+	font-size: 0.8em !important;
+}
+#fedora-header-search-entry:focus {
+	background-color: #fff;
+	border: 1px solid #555;
+}
+#fedora-header-search-button {
+	font-size: 0.8em !important;
+	vertical-align: top;
+	margin-top: 0.2em;
+	border: 0;
+	padding: 7px;
+	background: #fff url('../images/header-search.png') no-repeat left;
+	padding-left: 21px;
+}
+#fedora-header-items form {
+	float: right;
+}
+#fedora-header-items input {
+	font-size: 0.85em;
+}
+#fedora-nav {
+	margin: 0;
+	padding: 0;
+	background-color: #22437f;
+	font-size: 0;
+	height: 5px;
+	border-top: 1px solid #000;
+	border-bottom: 1px solid #f5f5f5;
+}
+#fedora-nav ul {
+	margin: 0;
+	padding: 0;
+}
+#fedora-nav li {
+	display: inline;
+	list-style: none;
+	padding: 0 5pt;
+}
+#fedora-nav li + li {
+	padding-left: 8pt;
+	border-left: 1px solid #99a5bf;
+}
+#fedora-nav a {
+	color: #c5ccdb;
+	text-decoration: none;
+}
+#fedora-nav a:hover {
+	color: #fff;
+}
+
+#fedora-side-left {
+	position: absolute;
+	z-index: 2;
+	width: 11em; 
+	/* Space down for the approx line height (fonts) */
+	left: 12px;
+}
+#fedora-side-right {
+	position: absolute;
+	z-index: 1;
+	width: 20em;
+	right: 12px;
+	padding-top: 3px;
+	}
+#fedora-side-left, #fedora-side-right {
+	top: 2px;
+	/* add to the top margin to compensate for the fixed sizes */
+	margin-top: 75px;
+	color: #555;
+	font-size: 0.9em;
+}
+#fedora-side-right ul {
+	list-style: square inside;
+	padding: 0;
+	margin: 0;
+}
+
+/* Left-side naviagation */
+#fedora-side-nav-label {
+	display: none;
+}
+#fedora-side-nav {
+	list-style: none;
+	margin: 0;
+	padding: 0;
+	border: 1px solid #5976b2;
+	border-top: 0;
+	background-color: #22437f;
+}
+#fedora-side-nav li {
+	margin: 0;
+	padding: 0;
+	border-top: 1px solid #5976b2;
+	/* IE/Win gets upset if there is no bottom border... Go figure. */
+	border-bottom: 1px solid #22437f;
+}
+#fedora-side-nav a {
+	margin: 0;
+	color: #c5ccdb;
+	display: block;
+	text-decoration: none;
+	padding: 4px 6px;
+}
+#fedora-side-nav a:hover {
+	background-color: #34548f;
+	color: #fff;
+}
+#fedora-side-nav ul {
+	list-style: none;
+	margin: 0;
+	padding: 0;
+}
+#fedora-side-nav ul li {
+	border-top: 1px solid #34548e;
+	background-color: #34548e;
+	/* IE/Win gets upset if there is no bottom border... Go figure. */
+	border-bottom: 1px solid #34548e;
+}
+#fedora-side-nav ul li:hover {
+	border-bottom: 1px solid #34548f;
+}
+#fedora-side-nav ul li a {
+	padding-left: 12px;
+	color: #a7b2c9;
+}
+#fedora-side-nav ul li a:hover {
+	background-color: #46659e;
+}
+#fedora-side-nav ul ul li a {
+	padding-left: 18px;
+}
+#fedora-side-nav strong a {
+	font-weight: normal;
+	color: #fff !important;
+	background-color: #10203b;
+}
+#fedora-side-nav strong a:hover {
+	background-color: #172e56 !important;
+}
+
+/* content containers */
+#fedora-middle-one, #fedora-middle-two, #fedora-middle-three {
+	font-size: 0.9em;
+	/* position: relative; */ /* relative to utilize z-index */
+	width: auto;
+	min-width: 120px;
+	margin: 10px;
+	z-index: 3; /* content can overlap when the browser is narrow */
+}
+/*
+#fedora-middle-two, #fedora-middle-three {
+	margin-left: 11em;
+	padding-left: 24px;
+}
+*/
+#fedora-middle-three {
+	margin-right: 20em;
+	padding-right: 24px;
+}
+
+#fedora-content {
+	padding: 24px;
+	border: 1px solid #aaa;
+	background-color: #fff;
+}
+
+#fedora-content > .fedora-corner-bottom { top: 0 }
+
+.fedora-corner-tl, .fedora-corner-tr, .fedora-corner-bl, .fedora-corner-br {
+	background-color: #d9d9d9;
+	position: relative;
+	width: 19px;
+	height: 19px;
+	/* The following line is to render PNGs with alpha transparency within IE/Win, using DirectX */
+	/* Work-around for IE6/Mac borkage (Part 1) */
+	display: none;
+}
+
+.fedora-corner-tl, .fedora-corner-bl { float: left; left: 0px; }
+.fedora-corner-tr, .fedora-corner-br { float: right; right: 0px; }
+.fedora-corner-tl, .fedora-corner-tr { top: 0px; }
+.fedora-corner-bl, .fedora-corner-br { bottom: 0px; margin-top: -19px; }
+
+
+html>body .fedora-corner-tl { background: #d9d9d9 url("../images/corner-tl.png") no-repeat left top; }
+html>body .fedora-corner-tr { background: #d9d9d9 url("../images/corner-tr.png") no-repeat right top; }
+html>body .fedora-corner-bl { background: #d9d9d9 url("../images/corner-bl.png") no-repeat left bottom; }
+html>body .fedora-corner-br { background: #d9d9d9 url("../images/corner-br.png") no-repeat right bottom; }
+
+.fedora-corner-tl { filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/corner-tl.png',sizingMethod='scale'); }
+.fedora-corner-tr { filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/corner-tr.png',sizingMethod='scale'); }
+.fedora-corner-br { filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/corner-br.png',sizingMethod='scale'); }
+.fedora-corner-bl { filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/corner-bl.png',sizingMethod='scale'); }
+
+/* \*/
+.fedora-corner-tl, .fedora-corner-tr, .fedora-corner-bl, .fedora-corner-br {
+	/* Restore the view for everything but IE6/Mac (part 2 of the "IE/Mac fix") */
+	display: block;
+}
+/* */
+
+html*.fedora-corner-bl, html*.fedora-corner-br {
+	/* Compensate for Opera's inability to position some things correctly (Part 2) */
+	top: 0px;
+}
+
+.content { margin: 0 1em }
+
+#fedora-sidelist {
+	position: relative;
+	bottom: 3px;
+	margin: 0;
+	padding: 3px !important;
+	border: 1px solid #bbb;
+	background-color: #ccc;
+	border-radius: 2.5px;
+	-moz-border-radius: 2.5px;
+}
+#fedora-sidelist strong a {
+	font-weight: normal;
+	background-color: #555;
+	color: #fff;
+}
+#fedora-sidelist strong a:hover {
+	background-color: #333;
+	color: #fff;
+}
+#fedora-sidelist li {
+	list-style-position: outside;
+	font-size: 0.9em;
+	list-style: none;
+	border: 1px solid #ccc;
+	border-width: 1px 0;
+	padding: 0;
+	list-style: none;
+}
+#fedora-sidelist li a {
+	text-decoration: none;
+	display: block;
+	padding: 6px 8px;
+	border-radius: 2.5px;
+	-moz-border-radius: 2.5px;
+}
+#fedora-sidelist li a:hover {
+	background-color: #999;
+	color: #eee;
+}
+
+#fedora-footer {
+	font-size: 0.75em;
+	text-align: center;
+	color: #777;
+	margin-bottom: 2em;
+}
+#fedora-printable {
+	text-align: center;
+	margin: 1em 0;
+	font-size: 0.85em;
+}
+#fedora-printable a {
+	text-decoration: none;
+	padding: 5px 0;
+	padding-left: 18px;
+	background: transparent url("../images/printable.png") no-repeat left;
+}
+#fedora-printable a:hover {
+	text-decoration: underline;
+}
+
+
+.left {
+	margin: 10px;
+	padding: 0px;
+	float: left;
+}
+
+.right {
+	margin: 10px;
+	padding: 0px;
+	float: right;
+}
+
+
+.blosxomStory p {
+	margin-top: 7px;
+	margin-bottom: 7px;
+}
\ No newline at end of file
diff --git a/roles/planet/files/sub-planets/people/css/people-style.css b/roles/planet/files/sub-planets/people/css/people-style.css
new file mode 100644
index 0000000000..9f95fc7535
--- /dev/null
+++ b/roles/planet/files/sub-planets/people/css/people-style.css
@@ -0,0 +1,169 @@
+html, body {
+	border: 0;
+	padding: 0;
+	margin: 0;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	min-width: 912px;
+	background-color: #eeeff1;
+}
+#header {
+	margin-bottom: 23px; /* sync this value with margin-top of #content */
+	background: #2963a5 url("../images/people-header.png") repeat-y 20% 0%;
+	height: 74px;
+}
+#header .logo {
+	position: absolute;
+	display: block;
+	left: 5px;
+	top: 3px;
+}
+#content {
+	margin-top: -23px;  /* sync this value with margin-top of #content */
+	margin-right: 210px;
+	background-color: white;
+}
+.blog-entries-daily {
+	background: white url("../images/people-entry-group-date-header.png") no-repeat top right;
+	margin-right: 25px;
+	position: relative;
+	padding-bottom: 12px;
+	margin-bottom: 30px;
+}
+.blog-date {
+	text-align: center;
+	background: transparent url("../images/people-entry-group-date-background.png") repeat-y top right;
+	color: white;
+	margin-top: 11px;
+	position: absolute;
+	right: 0;
+	font-size: 0.9em;
+	width: 229px;
+	height: 100%;
+}
+.blog-entry {
+	clear: both;
+	margin: 11px 0;
+	position: relative;
+	top: 40px;
+}
+.blog-entry-author {
+	float: left;
+	margin-top: 30px;
+	padding: 0 20px 30px 0;
+	width: 125px;
+	font-size: 0.8em;
+	text-align: center;
+}
+.blog-entry-author :link, .blog-entry-author :visited {
+	font-size: 0.9em;
+}
+.blog-entry-author .head {
+	display: block;
+	margin: 1ex auto;
+	border: 0;
+}
+.blog-entry-post {
+	margin: 1em 0 1em 145px;
+	border-radius: 20px;
+	background: transparent url("../images/people-entry-center-left.png") repeat-y center left;
+}
+.blog-entry-header {
+	background: transparent url("../images/people-entry-top-center.png") repeat-x top center;
+	height: 50px;
+}
+.blog-entry-title {
+	font-size: larger;
+	background: transparent url("../images/people-entry-top-left.png") no-repeat top left;
+	height: 50px;
+}
+.blog-entry-title a {
+	padding: 1em 0;
+	display: block;
+	margin-left: 25px;
+	background: transparent url("../images/people-entry-top-right.png") no-repeat top right;
+	height: 50px;
+}
+.blog-entry-content {
+	padding-top:10px;
+	padding-right: 3em;
+	margin-left: 25px;
+	text-align: justify;
+	font-size: 0.8em;
+	font-weight: normal;
+	background: transparent url("../images/people-entry-center-right.png") repeat-y center right;
+	padding-bottom:10px;
+	position: relative;
+	overflow: auto;
+}
+.blog-entry-content img {
+	max-width: 575px;
+	margin-left: 2ex;
+}
+.blog-entry-footer {
+	background: transparent url("../images/people-entry-bottom-center.png") repeat-x bottom center;
+}
+.blog-entry-timestamp {
+	font-size: x-small;
+	text-align: right;
+	color: #b3b3b3;
+	background: transparent url("../images/people-entry-bottom-left.png") no-repeat bottom left;
+}
+.blog-entry-timestamp a {
+	display: block;
+	color: #b3b3b3;
+	text-decoration: none;
+	height: 35px;
+	background: transparent url("../images/people-entry-bottom-right.png") no-repeat bottom right;
+	padding: 1em 5em 0 0;
+}
+#disclaimer {
+	font-size: x-small;
+	color: #b3b3b3;
+	text-align: center;
+	padding: 1em;
+}
+#sidebar {
+	color: #555555;
+	background-color: #eeeff1;
+	font-size: 0.8em;
+	position: absolute;
+	width: 210px;
+	min-width: 210px;
+	max-width: 210px;
+	top: 0;
+	right: 0;
+	margin: 0;
+	border-left: 2px solid white;
+	height: 100%;
+}
+#sidebar #sidebar-header {
+	display: block;
+	background-color: #2963a5;
+}
+#sidebar-inner {
+	padding: 10px;
+}
+#sidebar h2 {
+	font-size: 1.4em;
+	font-weight: normal;
+	border-bottom: 1px solid #cfd4d9;
+	margin: 5px 0px;
+	padding: 0px 5px;
+}
+
+#sidebar ul {
+	list-style: square inside;
+	padding: 0;
+	margin: 0 0 1em 0;
+	color: #22538b;
+}
+#spacer {
+	height: 1em;
+}
+:link {
+	color: #337ACC;
+}
+:visited {
+	color: #6A3B18;
+}
+
diff --git a/roles/planet/files/sub-planets/people/css/print.css b/roles/planet/files/sub-planets/people/css/print.css
new file mode 100644
index 0000000000..0be9beab70
--- /dev/null
+++ b/roles/planet/files/sub-planets/people/css/print.css
@@ -0,0 +1,86 @@
+body {
+	background: white;
+	color: black;
+	font-size: 10pt;
+	font-family: sans-serif;
+	line-height: 1.25em;
+}
+
+div {
+	border: 1px solid white;
+}
+li {
+	border: 1px solid white;
+	margin: 0;
+}
+li p {
+	display: inline;
+}
+
+h1 {
+	font-size: 16pt;
+}
+h2 {
+	font-size: 12pt;
+}
+h3,h4,h5 {
+	font-size: 10pt;
+}
+img {
+	border: 1px solid white;
+	background-color: white;
+}
+hr {
+	border: 1px dotted gray;
+	border-width: 0 0 1 0;
+	margin: 1em;
+}
+table {
+	border-collapse: collapse;
+}
+td,th {
+	border: 1px solid gray;
+	padding: 8pt;
+	font-size: 10pt;
+}
+th {
+	font-weight: bold;
+}
+#fedora-header, #fedora-footer {
+	text-align: center;
+}
+#fedora-header-items, #fedora-side-left, #fedora-side-right {
+	display: none;
+}
+
+#fedora-project-download dt {
+	font-weight: bold;
+	margin-top: 8pt;
+	margin-left: 5pt;
+}
+#fedora-project-download dd {
+	padding: 0;
+	margin: 10px 20px 0;
+}
+
+code.screen, pre.screen {
+	font-family: monospace;
+	font-size: 1em;
+	display: block;
+	padding: 5pt;
+	border: 1px dashed gray;
+	margin: 0.5em 2em;
+}
+#fedora-project code.screen {
+	margin: 0;
+}
+
+/*
+#fedora-content a:link:after, #fedora-content a:visited:after {
+	content: " (" attr(href) ") ";
+	font-size: 80%;
+}
+*/
+.navheader table, .navheader table td {
+	border: 0 !important;
+}
diff --git a/roles/planet/files/sub-planets/people/images/blue.png b/roles/planet/files/sub-planets/people/images/blue.png
new file mode 100644
index 0000000000..6987cab624
Binary files /dev/null and b/roles/planet/files/sub-planets/people/images/blue.png differ
diff --git a/roles/planet/files/sub-planets/people/images/corner-bl.png b/roles/planet/files/sub-planets/people/images/corner-bl.png
new file mode 100644
index 0000000000..58d269c306
Binary files /dev/null and b/roles/planet/files/sub-planets/people/images/corner-bl.png differ
diff --git a/roles/planet/files/sub-planets/people/images/corner-br.png b/roles/planet/files/sub-planets/people/images/corner-br.png
new file mode 100644
index 0000000000..c03dd92bec
Binary files /dev/null and b/roles/planet/files/sub-planets/people/images/corner-br.png differ
diff --git a/roles/planet/files/sub-planets/people/images/corner-tl.png b/roles/planet/files/sub-planets/people/images/corner-tl.png
new file mode 100644
index 0000000000..08ab7a3ac2
Binary files /dev/null and b/roles/planet/files/sub-planets/people/images/corner-tl.png differ
diff --git a/roles/planet/files/sub-planets/people/images/corner-tr.png b/roles/planet/files/sub-planets/people/images/corner-tr.png
new file mode 100644
index 0000000000..b279db2961
Binary files /dev/null and b/roles/planet/files/sub-planets/people/images/corner-tr.png differ
diff --git a/roles/planet/files/sub-planets/people/images/favicon.ico b/roles/planet/files/sub-planets/people/images/favicon.ico
new file mode 100644
index 0000000000..d1ae2d209a
Binary files /dev/null and b/roles/planet/files/sub-planets/people/images/favicon.ico differ
diff --git a/roles/planet/files/sub-planets/people/images/header-download.png b/roles/planet/files/sub-planets/people/images/header-download.png
new file mode 100644
index 0000000000..a1cf3e577e
Binary files /dev/null and b/roles/planet/files/sub-planets/people/images/header-download.png differ
diff --git a/roles/planet/files/sub-planets/people/images/header-faq.png b/roles/planet/files/sub-planets/people/images/header-faq.png
new file mode 100644
index 0000000000..1e7c3c95d3
Binary files /dev/null and b/roles/planet/files/sub-planets/people/images/header-faq.png differ
diff --git a/roles/planet/files/sub-planets/people/images/header-fedora_logo.png b/roles/planet/files/sub-planets/people/images/header-fedora_logo.png
new file mode 100644
index 0000000000..552f201643
Binary files /dev/null and b/roles/planet/files/sub-planets/people/images/header-fedora_logo.png differ
diff --git a/roles/planet/files/sub-planets/people/images/header-projects.png b/roles/planet/files/sub-planets/people/images/header-projects.png
new file mode 100644
index 0000000000..aad307edd2
Binary files /dev/null and b/roles/planet/files/sub-planets/people/images/header-projects.png differ
diff --git a/roles/planet/files/sub-planets/people/images/heads/default.png b/roles/planet/files/sub-planets/people/images/heads/default.png
new file mode 100644
index 0000000000..407185b503
Binary files /dev/null and b/roles/planet/files/sub-planets/people/images/heads/default.png differ
diff --git a/roles/planet/files/sub-planets/people/images/heads/fdp.png b/roles/planet/files/sub-planets/people/images/heads/fdp.png
new file mode 100644
index 0000000000..5d00abe9e7
Binary files /dev/null and b/roles/planet/files/sub-planets/people/images/heads/fdp.png differ
diff --git a/roles/planet/files/sub-planets/people/images/heads/map_brazil_fedora_small.png b/roles/planet/files/sub-planets/people/images/heads/map_brazil_fedora_small.png
new file mode 100644
index 0000000000..7362552bad
Binary files /dev/null and b/roles/planet/files/sub-planets/people/images/heads/map_brazil_fedora_small.png differ
diff --git a/roles/planet/files/sub-planets/people/images/icon-fas.png b/roles/planet/files/sub-planets/people/images/icon-fas.png
new file mode 100644
index 0000000000..a6bf001d10
Binary files /dev/null and b/roles/planet/files/sub-planets/people/images/icon-fas.png differ
diff --git a/roles/planet/files/sub-planets/people/images/intro-computer.png b/roles/planet/files/sub-planets/people/images/intro-computer.png
new file mode 100644
index 0000000000..9298aecea3
Binary files /dev/null and b/roles/planet/files/sub-planets/people/images/intro-computer.png differ
diff --git a/roles/planet/files/sub-planets/people/images/intro-download.png b/roles/planet/files/sub-planets/people/images/intro-download.png
new file mode 100644
index 0000000000..c77db0be2d
Binary files /dev/null and b/roles/planet/files/sub-planets/people/images/intro-download.png differ
diff --git a/roles/planet/files/sub-planets/people/images/logo-spacer.png b/roles/planet/files/sub-planets/people/images/logo-spacer.png
new file mode 100644
index 0000000000..a104f5535f
Binary files /dev/null and b/roles/planet/files/sub-planets/people/images/logo-spacer.png differ
diff --git a/roles/planet/files/sub-planets/people/images/logo.png b/roles/planet/files/sub-planets/people/images/logo.png
new file mode 100644
index 0000000000..f277bf9281
Binary files /dev/null and b/roles/planet/files/sub-planets/people/images/logo.png differ
diff --git a/roles/planet/files/sub-planets/people/images/mainBack.png b/roles/planet/files/sub-planets/people/images/mainBack.png
new file mode 100644
index 0000000000..1372780be6
Binary files /dev/null and b/roles/planet/files/sub-planets/people/images/mainBack.png differ
diff --git a/roles/planet/files/sub-planets/people/images/people-entry-bottom-center.png b/roles/planet/files/sub-planets/people/images/people-entry-bottom-center.png
new file mode 100644
index 0000000000..8d8ee6ace4
Binary files /dev/null and b/roles/planet/files/sub-planets/people/images/people-entry-bottom-center.png differ
diff --git a/roles/planet/files/sub-planets/people/images/people-entry-bottom-left.png b/roles/planet/files/sub-planets/people/images/people-entry-bottom-left.png
new file mode 100644
index 0000000000..1aadc48c53
Binary files /dev/null and b/roles/planet/files/sub-planets/people/images/people-entry-bottom-left.png differ
diff --git a/roles/planet/files/sub-planets/people/images/people-entry-bottom-right.png b/roles/planet/files/sub-planets/people/images/people-entry-bottom-right.png
new file mode 100644
index 0000000000..047c9081f9
Binary files /dev/null and b/roles/planet/files/sub-planets/people/images/people-entry-bottom-right.png differ
diff --git a/roles/planet/files/sub-planets/people/images/people-entry-center-left.png b/roles/planet/files/sub-planets/people/images/people-entry-center-left.png
new file mode 100644
index 0000000000..9da8d17866
Binary files /dev/null and b/roles/planet/files/sub-planets/people/images/people-entry-center-left.png differ
diff --git a/roles/planet/files/sub-planets/people/images/people-entry-center-right.png b/roles/planet/files/sub-planets/people/images/people-entry-center-right.png
new file mode 100644
index 0000000000..379c8c0671
Binary files /dev/null and b/roles/planet/files/sub-planets/people/images/people-entry-center-right.png differ
diff --git a/roles/planet/files/sub-planets/people/images/people-entry-group-date-background.png b/roles/planet/files/sub-planets/people/images/people-entry-group-date-background.png
new file mode 100644
index 0000000000..f029a675a4
Binary files /dev/null and b/roles/planet/files/sub-planets/people/images/people-entry-group-date-background.png differ
diff --git a/roles/planet/files/sub-planets/people/images/people-entry-group-date-header.png b/roles/planet/files/sub-planets/people/images/people-entry-group-date-header.png
new file mode 100644
index 0000000000..47ee607a41
Binary files /dev/null and b/roles/planet/files/sub-planets/people/images/people-entry-group-date-header.png differ
diff --git a/roles/planet/files/sub-planets/people/images/people-entry-top-center.png b/roles/planet/files/sub-planets/people/images/people-entry-top-center.png
new file mode 100644
index 0000000000..6b3b33aebf
Binary files /dev/null and b/roles/planet/files/sub-planets/people/images/people-entry-top-center.png differ
diff --git a/roles/planet/files/sub-planets/people/images/people-entry-top-left.png b/roles/planet/files/sub-planets/people/images/people-entry-top-left.png
new file mode 100644
index 0000000000..007a1e2850
Binary files /dev/null and b/roles/planet/files/sub-planets/people/images/people-entry-top-left.png differ
diff --git a/roles/planet/files/sub-planets/people/images/people-entry-top-right.png b/roles/planet/files/sub-planets/people/images/people-entry-top-right.png
new file mode 100644
index 0000000000..bfb41fb2a2
Binary files /dev/null and b/roles/planet/files/sub-planets/people/images/people-entry-top-right.png differ
diff --git a/roles/planet/files/sub-planets/people/images/people-header.png b/roles/planet/files/sub-planets/people/images/people-header.png
new file mode 100644
index 0000000000..d1fcbbc3c1
Binary files /dev/null and b/roles/planet/files/sub-planets/people/images/people-header.png differ
diff --git a/roles/planet/files/sub-planets/people/images/people-logo.png b/roles/planet/files/sub-planets/people/images/people-logo.png
new file mode 100644
index 0000000000..6404e088f1
Binary files /dev/null and b/roles/planet/files/sub-planets/people/images/people-logo.png differ
diff --git a/roles/planet/files/sub-planets/people/images/people-logo.png.bak b/roles/planet/files/sub-planets/people/images/people-logo.png.bak
new file mode 100644
index 0000000000..1543ebe181
Binary files /dev/null and b/roles/planet/files/sub-planets/people/images/people-logo.png.bak differ
diff --git a/roles/planet/files/sub-planets/people/images/people-sidebar-header.png b/roles/planet/files/sub-planets/people/images/people-sidebar-header.png
new file mode 100644
index 0000000000..c82025672e
Binary files /dev/null and b/roles/planet/files/sub-planets/people/images/people-sidebar-header.png differ
diff --git a/roles/planet/files/sub-planets/people/images/planet.png b/roles/planet/files/sub-planets/people/images/planet.png
new file mode 100644
index 0000000000..9606a0c30d
Binary files /dev/null and b/roles/planet/files/sub-planets/people/images/planet.png differ
diff --git a/roles/planet/files/sub-planets/people/templates/atom.xml.tmpl b/roles/planet/files/sub-planets/people/templates/atom.xml.tmpl
new file mode 100644
index 0000000000..04aa46b373
--- /dev/null
+++ b/roles/planet/files/sub-planets/people/templates/atom.xml.tmpl
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+
+	<title><TMPL_VAR name></title>
+	<link rel="self" href="<TMPL_VAR feed ESCAPE="HTML">"/>
+	<link href="<TMPL_VAR link ESCAPE="HTML">"/>
+	<id><TMPL_VAR feed ESCAPE="HTML"></id>
+	<updated><TMPL_VAR date_iso></updated>
+	<generator uri="http://planet.fedoraproject.org/"><TMPL_VAR generator ESCAPE="HTML"></generator>
+
+<TMPL_LOOP Items>
+	<entry<TMPL_IF channel_language> xml:lang="<TMPL_VAR channel_language>"</TMPL_IF>>
+		<title type="html"<TMPL_IF title_language> xml:lang="<TMPL_VAR title_language>"</TMPL_IF>><TMPL_VAR title ESCAPE="HTML"></title>
+		<link href="<TMPL_VAR link ESCAPE="HTML">"/>
+		<id><TMPL_VAR id ESCAPE="HTML"></id>
+		<updated><TMPL_VAR date_iso></updated>
+		<content type="html"<TMPL_IF content_language> xml:lang="<TMPL_VAR content_language>"</TMPL_IF>>
+                <TMPL_IF channel_face>
+			&lt;img src=&quot;<TMPL_VAR channel_face ESCAPE="HTML">&quot; <TMPL_IF channel_facewidth>width=&quot;<TMPL_VAR channel_facewidth>&quot; </TMPL_IF><TMPL_IF channel_faceheight>height=&quot;<TMPL_VAR channel_faceheight>&quot; </TMPL_IF> alt=&quot;&quot; style=&quot;float: right;&quot;&gt;
+		</TMPL_IF> <TMPL_VAR content ESCAPE="HTML"></content>
+		<author>
+<TMPL_IF author_name>
+			<name><TMPL_VAR author_name ESCAPE="HTML"></name>
+<TMPL_IF author_email>
+			<email><TMPL_VAR author_email ESCAPE="HTML"></email>
+</TMPL_IF author_email>
+<TMPL_ELSE>
+<TMPL_IF channel_author_name>
+			<name><TMPL_VAR channel_author_name ESCAPE="HTML"></name>
+<TMPL_IF channel_author_email>
+			<email><TMPL_VAR channel_author_email ESCAPE="HTML"></email>
+</TMPL_IF channel_author_email>
+<TMPL_ELSE>
+			<name><TMPL_VAR channel_name ESCAPE="HTML"></name>
+</TMPL_IF>
+</TMPL_IF>
+			<uri><TMPL_VAR channel_link ESCAPE="HTML"></uri>
+		</author>
+		<source>
+<TMPL_IF channel_title>
+			<title type="html"><TMPL_VAR channel_title ESCAPE="HTML"></title>
+<TMPL_ELSE>
+			<title type="html"><TMPL_VAR channel_name ESCAPE="HTML"></title>
+</TMPL_IF>
+<TMPL_IF channel_subtitle>
+			<subtitle type="html"><TMPL_VAR channel_subtitle ESCAPE="HTML"></subtitle>
+</TMPL_IF>
+			<link rel="self" href="<TMPL_VAR channel_url ESCAPE="HTML">"/>
+<TMPL_IF channel_id>
+			<id><TMPL_VAR channel_id ESCAPE="HTML"></id>
+<TMPL_ELSE>
+			<id><TMPL_VAR channel_url ESCAPE="HTML"></id>
+</TMPL_IF>
+<TMPL_IF channel_updated_iso>
+			<updated><TMPL_VAR channel_updated_iso></updated>
+</TMPL_IF>
+<TMPL_IF channel_rights>
+			<rights type="html"><TMPL_VAR channel_rights ESCAPE="HTML"></rights>
+</TMPL_IF>
+		</source>
+	</entry>
+
+</TMPL_LOOP>
+</feed>
diff --git a/roles/planet/files/sub-planets/people/templates/foafroll.xml.tmpl b/roles/planet/files/sub-planets/people/templates/foafroll.xml.tmpl
new file mode 100644
index 0000000000..b2cecf3548
--- /dev/null
+++ b/roles/planet/files/sub-planets/people/templates/foafroll.xml.tmpl
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<rdf:RDF
+	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+	xmlns:foaf="http://xmlns.com/foaf/0.1/"
+	xmlns:rss="http://purl.org/rss/1.0/"
+	xmlns:dc="http://purl.org/dc/elements/1.1/"
+>
+<foaf:Group>
+	<foaf:name><TMPL_VAR name></foaf:name>
+	<foaf:homepage><TMPL_VAR link></foaf:homepage>
+	<rdfs:seeAlso rdf:resource="<TMPL_VAR uri ESCAPE="HTML">" />
+
+<TMPL_LOOP Channels>
+	<foaf:member>
+		<foaf:Agent>
+			<foaf:name><TMPL_VAR name></foaf:name>
+			<foaf:weblog>
+				<foaf:Document rdf:about="<TMPL_VAR link ESCAPE="HTML">">
+					<dc:title><TMPL_VAR title></dc:title>
+					<rdfs:seeAlso>
+						<rss:channel rdf:about="<TMPL_VAR uri ESCAPE="HTML">" />
+					</rdfs:seeAlso>
+				</foaf:Document>
+			</foaf:weblog>
+		</foaf:Agent>
+	</foaf:member>
+</TMPL_LOOP>
+
+</foaf:Group>
+</rdf:RDF>
diff --git a/roles/planet/files/sub-planets/people/templates/heads.html.tmpl b/roles/planet/files/sub-planets/people/templates/heads.html.tmpl
new file mode 100644
index 0000000000..4a82d75f45
--- /dev/null
+++ b/roles/planet/files/sub-planets/people/templates/heads.html.tmpl
@@ -0,0 +1,113 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<title>Planet Fedora</title>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8">
+    <meta http-equiv="Content-Type" content="text/html">
+    <meta name="MSSmartTagsPreventParsing" content="TRUE">
+    <link rel="stylesheet" type="text/css" media="print" href="http://planet.fedoraproject.org/css/print.css">
+    <link rel="stylesheet" type="text/css" media="all" href="http://fedoraproject.org/static/css/fedora.css">
+    <link rel="stylesheet" type="text/css" media="all" href="/css/fedora_planet.css">
+    <link rel="shortcut icon" href="/images/favicon.ico">
+    <link rel="icon" href="/images/favicon.ico">
+    <link rel="alternate" type="application/xml" title="RSS" href="http://planet.fedoraproject.org/rss20.xml">
+    <link rel="alternate" type="application/atom+xml" title="Fedora People Atom 1.0" href="http://planet.fedoraproject.org/atom.xml">
+    <style type="text/css">
+        #content ul {
+            overflow: auto;
+            list-style: none;
+        }
+        #content ul li {
+            height: 160px;
+            float: left;
+            text-align: center;
+            margin: 1em;
+        }
+        #content ul li img {
+            display: block;
+            margin: 0 auto;
+        }
+    </style>
+</head>
+<body class="home">
+    <div id="wrapper">
+
+        <div id="head">
+            <h1><a href="http://fedoraproject.org/">Fedora</a></h1>
+        </div>
+
+        <div id="sidebar">
+            <div id="planet_nav">
+
+                <h2>Feeds</h2>
+                <a href="rss10.xml">RSS 1.0</a><br>
+                <a href="rss20.xml">RSS 2.0</a><br>
+                <a href="atom.xml">Atom 1.0</a><br>
+                <a href="foafroll.xml">FOAF blogroll</a><br>
+
+
+                <h2>Links</h2>
+                <ul>
+                    <li><a href="http://fedoraproject.org">Fedora Home</a></li>
+                    <li><a href="http://fedoraproject.org/wiki/FWN">Fedora News</a></li>
+                    <li><a href="http://planet.fedoraproject.org/heads/">Hackergotchi Heads</a></li>
+                    <li><a href="http://fedoraproject.org/infofeed/">Fedora Info</a></li>
+                </ul>
+
+		<h2>Add your blog</h2>
+                <ul><li><a href="http://fedoraproject.org/wiki/Planet_HowTo">Add your blog</a></li></ul>
+		<ul><li><div class="fedora_planet">"The content on this page is provided by Fedora contributors, and represents their individual viewpoints, and not necessarily those of the Fedora Project or any of its sponsors or other members."</div></a></li></ul>
+
+                <h2>Other Aggregates</h2>
+                <ul>
+                    <li><a href="http://advogato.org/recentlog.html?thresh=4">Advogato</a> <a href="http://advogato.org/">(main)</a></li>
+                    <li><a href="http://planet.apache.org/">Planet Apache</a></li>
+                    <li><a href="http://planet.debian.net/">Planet Debian</a></li>
+
+                    <li><a href="http://planet.gnome.org/">Planet Gnome</a></li>
+                    <li><a href="http://www.kdedevelopers.org/blog">KDE Developers</a></li>
+                    <li><a href="http://planet.freedesktop.org">Freedesktop.org</a></li>
+                    <li><a href="http://www.planetmysql.org/">Planet MySQL</a></li>
+                </ul>
+
+                <h2>People</h2>
+                <ul id="people_feeds">
+
+                <TMPL_LOOP Channels>
+                    <li><a href="<TMPL_VAR url ESCAPE="HTML">"><img src="/images/rss.png" alt="RSS"></a><a href="<TMPL_VAR link>" title="<TMPL_VAR title>"><TMPL_VAR name></a></li>
+                </TMPL_LOOP>
+                </ul>
+
+            </div>
+        </div>
+
+
+        <div id="content">
+            <div class="spacer">
+            </div> <!-- :-} -->
+<ul>
+<TMPL_LOOP Channels>
+<!--<li class="head"><TMPL_IF link><a href="<TMPL_VAR link>" title="<TMPL_VAR title>"></TMPL_IF><img src="<TMPL_VAR face ESCAPE="HTML">" <TMPL_IF facewidth>width="<TMPL_VAR facewidth>" </TMPL_IF><TMPL_IF faceheight>height="<TMPL_VAR faceheight>" </TMPL_IF>alt="" /><TMPL_VAR name><TMPL_IF link></a></TMPL_IF></li>-->
+<li class="head"><TMPL_IF link><a href="<TMPL_VAR link ESCAPE="HTML">" title="<TMPL_VAR title>"></TMPL_IF><img src="<TMPL_VAR face ESCAPE="HTML">" /><TMPL_VAR name><TMPL_IF link></a></TMPL_IF></li>
+</TMPL_LOOP>
+</ul>
+
+    </div>
+</div>
+    <div id="bottom">
+        <div id="footer">
+            <p class="copy">&copy; 2010 Red Hat, Inc. and others.  Please send any comments or corrections to the <a href="mailto:webmaster@fedoraproject.org">websites team</a>.</p>
+            <p class="disclaimer">The Fedora Project is maintained and driven by the community and sponsored by Red Hat.  This is a community maintained site.  Red Hat is not responsible for content.</p>
+            <p class="disclaimer">Your words are your own, duh. Nothing here represents Fedora™, Red Hat, Inc, or pretty much anything else. If you think it does then you are badly misled</p>
+            <ul>
+                <li class="first"><a href="/en/sponsors">Sponsors</a></li>
+                <li><a href="http://fedoraproject.org/wiki/Legal">Legal</a></li>
+                <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a></li>
+            </ul>
+        </div>
+    </div>
+
+
+</body>
+</html>
diff --git a/roles/planet/files/sub-planets/people/templates/index.html.tmpl b/roles/planet/files/sub-planets/people/templates/index.html.tmpl
new file mode 100644
index 0000000000..bbd419454b
--- /dev/null
+++ b/roles/planet/files/sub-planets/people/templates/index.html.tmpl
@@ -0,0 +1,139 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<title>Planet Fedora</title>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8">
+    <meta http-equiv="Content-Type" content="text/html">
+    <meta name="MSSmartTagsPreventParsing" content="TRUE">
+    <link rel="stylesheet" type="text/css" media="print" href="http://planet.fedoraproject.org/css/print.css">
+    <link rel="stylesheet" type="text/css" media="all" href="http://fedoraproject.org/static/css/fedora.css">
+    <link rel="stylesheet" type="text/css" media="all" href="/css/fedora_planet.css">
+    <link rel="shortcut icon" href="/images/favicon.ico">
+    <link rel="icon" href="/images/favicon.ico">
+    <link rel="alternate" type="application/xml" title="RSS" href="http://planet.fedoraproject.org/rss20.xml">
+    <link rel="alternate" type="application/atom+xml" title="Fedora People Atom 1.0" href="http://planet.fedoraproject.org/atom.xml">
+</head>
+<body class="home">
+    <div id="wrapper">
+
+        <div id="head">
+            <h1><a href="http://fedoraproject.org/">Fedora</a></h1>
+        </div>
+
+        <div id="sidebar">
+            <div id="planet_nav">
+
+                <h2>Feeds</h2>
+                <a href="rss10.xml">RSS 1.0</a><br>
+                <a href="rss20.xml">RSS 2.0</a><br>
+                <a href="atom.xml">Atom 1.0</a><br>
+                <a href="foafroll.xml">FOAF blogroll</a><br>
+                <h2>Links</h2>
+                <ul>
+                    <li><a href="http://fedoraproject.org">Fedora Home</a></li>
+                    <li><a href="http://fedoraproject.org/wiki/FWN">Fedora News</a></li>
+                    <li><a href="http://planet.fedoraproject.org/heads/">Hackergotchi Heads</a></li>
+                    <li><a href="http://fedoraproject.org/infofeed/">Fedora Info</a></li>
+                </ul>
+		
+                <h2>Sub-Project planets</h2> 
+                <ul>
+                  <li><a href="http://planet.fedoraproject.org/design/">Design</a></li> 
+                  <li><a href="http://planet.fedoraproject.org/desktop/">Desktop</a></li>
+                  <li><a href="http://blogs.fedoraproject.org/wp/docsproject/">Documentation</a></li>
+                  <li><a href="http://planet.fedoraproject.org/security/">Security</a></li>
+                  <li><a href="http://planet.fedoraproject.org/summer-coding/">Summer Coding</a></li>
+             <!-- <li><a href="http://planet.fedoraproject.org/virt/">Virtualisation</a></li> NEEDS CONFIG CREATING 1ST -->
+                </ul>
+           
+
+		<h2>Add your blog</h2>
+                <ul><li><a href="http://fedoraproject.org/wiki/Planet_HowTo">Add your blog</a></li></ul>
+		<ul><li><div class="fedora_planet">"The content on this page is provided by Fedora contributors, and represents their individual viewpoints, and not necessarily those of the Fedora Project or any of its sponsors or other members."</div></a></li></ul>
+
+                <h2>Other Aggregates</h2>
+                <ul>
+                    <li><a href="http://advogato.org/recentlog.html?thresh=4">Advogato</a> <a href="http://advogato.org/">(main)</a></li>
+                    <li><a href="http://planet.apache.org/">Planet Apache</a></li>
+                    <li><a href="http://planet.debian.net/">Planet Debian</a></li>
+
+                    <li><a href="http://planet.gnome.org/">Planet Gnome</a></li>
+                    <li><a href="http://www.kdedevelopers.org/blog">KDE Developers</a></li>
+                    <li><a href="http://planet.freedesktop.org">Freedesktop.org</a></li>
+                    <li><a href="http://www.planetmysql.org/">Planet MySQL</a></li>
+                    <li><a href="http://www.graphicsplanet.org/">Graphics Planet</a></li>
+                </ul>
+
+                <h2>People</h2>
+                <ul id="people_feeds">
+
+                <TMPL_LOOP Channels>
+                    <li><a href="<TMPL_VAR url ESCAPE="HTML">"><img src="images/rss.png" alt="RSS"></a><a href="<TMPL_VAR link ESCAPE="HTML">" title="<TMPL_VAR title ESCAPE="HTML">"><TMPL_VAR name ESCAPE="HTML"></a></li>
+                </TMPL_LOOP>
+                </ul>
+
+            </div>
+        </div>
+
+
+        <div id="content">
+            <div class="spacer">
+        <TMPL_LOOP Items>
+
+            <TMPL_IF new_date>
+            </div> <!-- :-} -->
+
+            <div class="blog-entries-daily">
+            <h2 class="blog-date"><TMPL_VAR new_date></h2>
+            </TMPL_IF>
+
+
+            <div class="blog-entry <TMPL_VAR channel_name>">
+                <div class="blog-entry-post">
+                    <div class="blog-entry-header">
+                        <div class="blog-entry-author">
+
+                            <TMPL_IF channel_face>
+                                <img src="<TMPL_VAR channel_face ESCAPE="HTML">" <TMPL_IF channel_facewidth>width="<TMPL_VAR channel_facewidth>" </TMPL_IF><TMPL_IF channel_faceheight>height="<TMPL_VAR channel_faceheight>" </TMPL_IF>alt="">
+                                <br><a href="<TMPL_VAR channel_link ESCAPE="HTML">"><TMPL_VAR channel_name></a>
+
+                            </TMPL_IF>
+			    <TMPL_IF channel_fasname>
+                                <div class="fas-account">(<img src="https://fedoraproject.org/w/uploads/a/ac/Infra-icon_fas.png" alt="Fedora Account System Username" name="Fedora Account System Username"><a href="https://admin.fedoraproject.org/accounts/user/view/<TMPL_VAR channel_fasname ESCAPE="HTML">"><TMPL_VAR channel_fasname ESCAPE="HTML"></a>)</div>
+                            </TMPL_IF>
+                        </div>
+
+                        <div class="blog-entry-title"><a href="<TMPL_VAR link>"><TMPL_IF title><TMPL_VAR title><TMPL_ELSE>Untitled Post</TMPL_IF></a></div>
+                    </div>
+
+                    <div class="blog-entry-content-container">
+
+                        <div class="blog-entry-content"><TMPL_VAR content></div>
+
+                    </div>
+                    <div class="blog-entry-footer">
+                    <div class="blog-entry-timestamp"><a href="<TMPL_VAR link ESCAPE="HTML">"><TMPL_IF creator>by <TMPL_VAR creator> at </TMPL_IF><TMPL_VAR date></a></div>
+                    </div>
+                </div>
+            </div>
+    </TMPL_LOOP>
+        </div>
+    </div>
+</div>
+    <div id="bottom">
+        <div id="footer">
+            <p class="copy">&copy; 2010 Red Hat, Inc. and others.  Please send any comments or corrections to the <a href="mailto:webmaster@fedoraproject.org">websites team</a>.</p>
+            <p class="disclaimer">The Fedora Project is maintained and driven by the community and sponsored by Red Hat.  This is a community maintained site.  Red Hat is not responsible for content.</p>
+            <p class="disclaimer">Your words are your own, duh. Nothing here represents Fedora™, Red Hat, Inc, or pretty much anything else. If you think it does then you are badly misled</p>
+            <ul>
+                <li class="first"><a href="/en/sponsors">Sponsors</a></li>
+                <li><a href="http://fedoraproject.org/wiki/Legal">Legal</a></li>
+                <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a></li>
+            </ul>
+        </div>
+    </div>
+
+
+</body>
+</html>
diff --git a/roles/planet/files/sub-planets/people/templates/opml.xml.tmpl b/roles/planet/files/sub-planets/people/templates/opml.xml.tmpl
new file mode 100644
index 0000000000..aaa8833810
--- /dev/null
+++ b/roles/planet/files/sub-planets/people/templates/opml.xml.tmpl
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<opml version="1.1">
+	<head>
+		<title><TMPL_VAR name></title>
+		<dateCreated><TMPL_VAR date_822></dateCreated>
+		<dateModified><TMPL_VAR date_822></dateModified>
+		<ownerName><TMPL_VAR owner_name></ownerName>
+		<ownerEmail><TMPL_VAR owner_email></ownerEmail>
+	</head>
+	
+	<body>
+		<TMPL_LOOP Channels>
+		<outline text="<TMPL_VAR name ESCAPE="HTML">" xmlUrl="<TMPL_VAR url ESCAPE="HTML">"/>
+		</TMPL_LOOP>
+	</body>
+</opml>
diff --git a/roles/planet/files/sub-planets/people/templates/rss10.xml.tmpl b/roles/planet/files/sub-planets/people/templates/rss10.xml.tmpl
new file mode 100644
index 0000000000..2bf19195c3
--- /dev/null
+++ b/roles/planet/files/sub-planets/people/templates/rss10.xml.tmpl
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<rdf:RDF
+	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	xmlns:dc="http://purl.org/dc/elements/1.1/"
+	xmlns:foaf="http://xmlns.com/foaf/0.1/"
+	xmlns:content="http://purl.org/rss/1.0/modules/content/"
+	xmlns="http://purl.org/rss/1.0/"
+>
+<channel rdf:about="<TMPL_VAR link ESCAPE="HTML">">
+	<title><TMPL_VAR name></title>
+    <link><TMPL_VAR link ESCAPE="HTML"></link>
+        <description>Fedora People: http://planet.fedoraproject.org</description>
+	<items>
+		<rdf:Seq>
+<TMPL_LOOP Items>
+			<rdf:li rdf:resource="<TMPL_VAR id ESCAPE="HTML">" />
+</TMPL_LOOP>
+		</rdf:Seq>
+	</items>
+</channel>
+
+<TMPL_LOOP Items>
+<item rdf:about="<TMPL_VAR id ESCAPE="HTML">">
+	<title><TMPL_VAR channel_name><TMPL_IF title>: <TMPL_VAR title></TMPL_IF></title>
+    <link><TMPL_VAR link ESCAPE="HTML"></link>
+	<TMPL_IF content>
+	<content:encoded><TMPL_VAR content ESCAPE="HTML"></content:encoded>
+	</TMPL_IF>
+	<dc:date><TMPL_VAR date_iso></dc:date>
+</item>
+</TMPL_LOOP>
+
+</rdf:RDF>
diff --git a/roles/planet/files/sub-planets/people/templates/rss20.xml.tmpl b/roles/planet/files/sub-planets/people/templates/rss20.xml.tmpl
new file mode 100644
index 0000000000..882b341fc4
--- /dev/null
+++ b/roles/planet/files/sub-planets/people/templates/rss20.xml.tmpl
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
+<channel>
+   <atom:link href="http://planet.fedoraproject.org/rss20.xml" rel="self" type="application/rss+xml" />
+	<title><TMPL_VAR name></title>
+	<link><TMPL_VAR link></link>
+	<language>en</language>
+        <description>Fedora People: http://planet.fedoraproject.org</description>
+
+<TMPL_LOOP Items>
+<item>
+	<title><TMPL_VAR channel_name><TMPL_IF title>: <TMPL_VAR title></TMPL_IF></title>
+	<guid isPermaLink="false"><TMPL_VAR id ESCAPE="HTML"></guid>
+	<link><TMPL_VAR link ESCAPE="HTML"></link>
+	<TMPL_IF content>
+
+	<description>
+		<TMPL_IF channel_face>
+			&lt;img src=&quot;<TMPL_VAR channel_face ESCAPE="HTML">&quot; <TMPL_IF channel_facewidth>width=&quot;<TMPL_VAR channel_facewidth>&quot; </TMPL_IF><TMPL_IF channel_faceheight>height=&quot;<TMPL_VAR channel_faceheight>&quot; </TMPL_IF> alt=&quot;&quot; style=&quot;float: right;&quot;&gt;
+		</TMPL_IF>
+		<TMPL_VAR content ESCAPE="HTML"></description>
+	</TMPL_IF>
+	<pubDate><TMPL_VAR date_822></pubDate>
+</item>
+</TMPL_LOOP>
+
+</channel>
+</rss>
diff --git a/roles/planet/files/sub-planets/security/base_config b/roles/planet/files/sub-planets/security/base_config
new file mode 100644
index 0000000000..c5e9c59924
--- /dev/null
+++ b/roles/planet/files/sub-planets/security/base_config
@@ -0,0 +1,26 @@
+[Planet]
+name = Fedora security Planet
+link = http://planet.fedoraproject.org/security/
+owner_name = Fedora Admin
+owner_email = admin@fedoraproject.org
+cache_directory = /srv/planet/config/security/cache
+template_files = /srv/planet/config/security/templates/index.html.tmpl /srv/planet/config/security/templates/rss20.xml.tmpl /srv/planet/config/security/templates/rss10.xml.tmpl //srv/planet/config/security/templates/opml.xml.tmpl ///srv/planet/config/security/templates/foafroll.xml.tmpl ////srv/planet/config/security/templates/atom.xml.tmpl /////srv/planet/config/security/templates/heads.html.tmpl 
+output_dir = /srv/planet/site/security
+items_per_page = 50
+log_level = ERROR
+date_format = %B %d, %Y %I:%M %p
+spider_threads=20
+#
+#     [DEFAULT]
+#     facewidth = 64
+#     faceheight = 64
+#
+#     [http://www.blog.com/rss]
+#     face = foo.png
+#     faceheight = 32
+#
+# The facewidth of the defined blog defaults to 64.
+
+[DEFAULT]
+face = http://planet.fedoraproject.org/security/images/heads/default.png
+
diff --git a/roles/planet/files/sub-planets/security/css/content.css b/roles/planet/files/sub-planets/security/css/content.css
new file mode 100644
index 0000000000..982924ee61
--- /dev/null
+++ b/roles/planet/files/sub-planets/security/css/content.css
@@ -0,0 +1,237 @@
+.name-project, .name-release, .name-version {
+}
+
+/* Front page H1 */
+#page-main h1 {
+	font-size: 1.35em;
+}
+
+#page-main h1.center {
+	text-align: center;
+}
+
+h1, h2, h3, h4 {
+	/*
+	font-style: italic;
+	*/
+	font-family: luxi sans,sans-serif;
+}
+h1 {
+	font-size: 1.75em;
+}
+
+h2 {
+	font-size: 1.25em;
+#	background-color: #eee;
+}
+
+h3 {
+	font-size: 1.1em;
+}
+
+hr {
+	border: 0;
+	border-bottom: 1px solid #ccc;
+}
+
+.fedora-side-right-content {
+	padding: 1 5px 1.5em;
+	font-size: 1em;
+}
+#fedora-side-right h1, #fedora-side-right h2, #fedora-side-right h3 {
+	margin: 0;
+	padding: 0 4pt 0;
+	font-size: 1em;
+	letter-spacing: 2pt;
+	border-bottom: 1px solid #bbb;
+}
+#fedora-side-right hr {
+	border-bottom: 1px solid #aaa;
+	margin: 0.5em 0;
+}
+
+table tr {
+	font-size: 0.9em; 
+}
+
+
+#link-offsite {
+}
+.link-offsite-notation {
+	font-size: 0.9em;
+	color: #777;
+	padding-left: 1pt;
+	text-decoration: none !important;
+}
+#fedora-content .link-offsite-notation {
+	color: #999;
+}
+#link-redhat {
+}
+#fedora-content #link-redhat {
+}
+#link-internal {
+}
+
+#fedora-content li {
+	padding: 1pt;
+}
+#fedora-content h1 {
+	margin-top: 0;
+}
+
+#fedora-content a img {
+	margin: 1px;
+	border: 0;
+}
+#fedora-content a:hover img {
+	margin: 0;
+	border: 1px solid #f00;
+}
+#fedora-content a img.noborder {
+	margin: 0;
+	border: 0;
+}
+#fedora-content a:hover img .noborder {
+	margin: 0;
+	border: 0;
+}
+
+#fedora-project-maintainers p, #fedora-project-contributors p, #fedora-project-bugs p {
+	margin-left: 5pt;
+}
+
+#fedora-project-download dt {
+	font-weight: bold;
+	margin-top: 8pt;
+	margin-left: 5pt;
+}
+#fedora-project-download dd {
+	padding: 0;
+	margin: 10px 20px 0;
+}
+#fedora-project-screenshots a img {
+	margin: 5px;
+}
+#fedora-project-screenshots a:hover img {
+	margin: 4px;
+}
+#fedora-project-todo ul {
+	border: 1px solid #cad4e9;
+	margin: 0 1em;
+	padding: 0;
+	list-style: none;
+	border-radius: 2.5px;
+	-moz-border-radius: 2.5px;
+}
+#fedora-project-todo li {
+	margin: 0;
+	padding: 6px 8px;
+}
+#fedora-project-todo li.odd {
+	background-color: #ecf0f7;
+}
+#fedora-project-todo li.even {
+	background-color: #f7f9fc;
+}
+
+#fedora-list-packages {
+	border-collapse: collapse;
+	border: 1px solid #cad4e9;
+	border-radius: 2.5px;
+	-moz-border-radius: 2.5px;
+}
+#fedora-list-packages tr.odd td {
+	background-color: #ecf0f7;
+}
+#fedora-list-packages tr.even td {
+	background-color: #f7f9fc;
+}
+#fedora-list-packages th,
+#fedora-list-packages td {
+	margin: 0;
+	padding: 6px 8px;
+}
+#fedora-list-packages td.column-2 {
+	text-align: center;
+}
+#fedora-list-packages th {
+	background-color: #cad4e9;
+	color: #000;
+	font-weight: bold;
+	text-align: center;
+
+}
+
+/* pre.screen is for DocBook HTML output */
+code.screen, pre.screen {
+	font-family: monospace;
+	font-size: 1em;
+	display: block;
+	padding: 10px;
+	border: 1px solid #bbb;
+	background-color: #eee;
+	color: #000;
+	overflow: auto;
+	border-radius: 2.5px;
+	-moz-border-radius: 2.5px;
+	margin: 0.5em 2em;
+}
+#fedora-project code.screen {
+	margin: 0;
+}
+
+code.command, code.filename {
+	font-family: monospace;
+}
+
+code.citetitle {
+	font-family: sans-serif;
+	font-style: italic;
+}
+
+strong.application {
+	font-weight: bold;
+}
+.indent {
+	margin: 0 2em;
+}
+.fedora-docs-nav {
+	text-align: center;
+	position: relative;
+	padding: 1em;
+	margin-top: 2em;
+	border-top: 1px solid #ccc;
+}
+.fedora-docs-nav a {
+	padding: 0 1em;
+}
+.fedora-docs-nav-left {
+	position: absolute;
+	left: 0;
+}
+.fedora-docs-nav-right {
+	position: absolute;
+	right: 0;
+}
+
+.fedoraEntry {
+
+padding-left: 10px;
+padding-right: 10px;
+padding-bottom: 10px;
+padding-top: 10px;
+border-bottom: 1px solid #ccc;
+}
+
+.fedoraStory {
+}
+
+.fedoraFace {
+	margin: 0 0 10px 10px;
+	float: right;
+}
+
+.fedoraTitle {
+	font-size: 1.25em;
+}
diff --git a/roles/planet/files/sub-planets/security/css/docbook.css b/roles/planet/files/sub-planets/security/css/docbook.css
new file mode 100644
index 0000000000..3181bce246
--- /dev/null
+++ b/roles/planet/files/sub-planets/security/css/docbook.css
@@ -0,0 +1,71 @@
+#fedora-content li p {
+	margin: 0.2em;
+}
+
+#fedora-content div.table table {
+	width: 95%;
+	background-color: #DCDCDC; 
+	color: #000000;
+	border-spacing: 0;
+}
+
+#fedora-content div.table table th {
+	border: 1px solid #A9A9A9;	
+	background-color: #A9A9A9;
+	color: #000000;
+}
+
+#fedora-content div.table table td {
+	border: 1px solid #A9A9A9; 
+	background-color: #DCDCDC;
+	color: #000000;
+	padding: 0.5em;
+	margin-bottom: 0.5em;
+	margin-top: 2px; 
+
+}
+
+div.note table, div.tip table, div.important table, div.caution table, div.warning table {
+	width: 95%;
+	border: 2px solid #B0C4DE;
+	background-color: #F0F8FF;
+	color: #000000;
+	/* padding inside table area */
+	padding: 0.5em;
+	margin-bottom: 0.5em;
+	margin-top: 0.5em;
+}
+
+/* "Just the FAQs, ma'm." */
+.qandaset table {
+	border-collapse: collapse;
+}
+.qandaset {
+}
+.qandaset tr.question {
+}
+.qandaset tr.question td {
+	font-weight: bold;
+	padding: 0 0.5em;
+	margin: 0;
+}
+.qandaset tr.answer td {
+	padding: 0 0.5em 1.5em;
+	margin: 0;
+}
+.qandaset tr.question td, .qandaset tr.answer td {
+	vertical-align: top;
+}
+.qandaset strong {
+	text-align: right;
+}
+
+.article .table table {
+	border: 0;
+	margin: 0 auto;
+	border-collapse: collapse;
+}
+.article .table table th {
+	padding: 5px;
+	text-align: center;
+}
diff --git a/roles/planet/files/sub-planets/security/css/layout.css b/roles/planet/files/sub-planets/security/css/layout.css
new file mode 100644
index 0000000000..6ceba83ce0
--- /dev/null
+++ b/roles/planet/files/sub-planets/security/css/layout.css
@@ -0,0 +1,362 @@
+	body {
+	font-size: 0.9em;
+	font-family: bitstream vera sans,sans-serif;
+	margin: 0;
+	padding: 0;
+	/* (The background color is specified elsewhere, so do a global replacement if it ever changes) */
+	background-color: #d9d9d9;
+}
+
+a:link {
+	color: #900;
+}
+a:visited {
+	color: #48468f;
+}
+a:hover {
+	color: #f20;
+}
+a[name] {
+	color: inherit;
+	text-decoration: inherit;
+}
+
+#fedora-header {
+	background-color: #fff;
+	height: 62px;
+}
+#fedora-header img {
+	border: 0;
+	vertical-align: middle;
+}
+#fedora-header-logo {
+	/* position is offset by the header padding amount */
+	position: absolute;
+	left: 26px;
+	top: 13px;
+	z-index: 3;
+}
+#fedora-header-logo img {
+	width: 110px;
+	height: 40;
+}
+#fedora-header-items {
+	/* position is offset by the header padding amount */
+	position: absolute;
+	right: 10px;
+	top: 15px;
+	text-align: right;
+	display: inline;
+}
+#fedora-header-items a {
+	color: #000;
+	text-decoration: none;
+	padding: 7pt;
+	font-size: 0.8em;
+}
+#fedora-header-items a:hover, #fedora-header-search-button:hover {
+	color: #f20;
+	cursor: pointer;
+}
+#fedora-header-items img {
+	margin-right: 1px;
+	width: 36px;
+	height: 36px;
+}
+#fedora-header-search {
+	height: 25px;
+}
+#fedora-header-search-entry {
+	vertical-align: top;
+	margin: 0.65em 4px 0 10px;
+	padding: 2px 4px;
+	background-color: #f5f5f5;
+	border: 1px solid #999;
+	font-size: 0.8em !important;
+}
+#fedora-header-search-entry:focus {
+	background-color: #fff;
+	border: 1px solid #555;
+}
+#fedora-header-search-button {
+	font-size: 0.8em !important;
+	vertical-align: top;
+	margin-top: 0.2em;
+	border: 0;
+	padding: 7px;
+	background: #fff url('../images/header-search.png') no-repeat left;
+	padding-left: 21px;
+}
+#fedora-header-items form {
+	float: right;
+}
+#fedora-header-items input {
+	font-size: 0.85em;
+}
+#fedora-nav {
+	margin: 0;
+	padding: 0;
+	background-color: #22437f;
+	font-size: 0;
+	height: 5px;
+	border-top: 1px solid #000;
+	border-bottom: 1px solid #f5f5f5;
+}
+#fedora-nav ul {
+	margin: 0;
+	padding: 0;
+}
+#fedora-nav li {
+	display: inline;
+	list-style: none;
+	padding: 0 5pt;
+}
+#fedora-nav li + li {
+	padding-left: 8pt;
+	border-left: 1px solid #99a5bf;
+}
+#fedora-nav a {
+	color: #c5ccdb;
+	text-decoration: none;
+}
+#fedora-nav a:hover {
+	color: #fff;
+}
+
+#fedora-side-left {
+	position: absolute;
+	z-index: 2;
+	width: 11em; 
+	/* Space down for the approx line height (fonts) */
+	left: 12px;
+}
+#fedora-side-right {
+	position: absolute;
+	z-index: 1;
+	width: 20em;
+	right: 12px;
+	padding-top: 3px;
+	}
+#fedora-side-left, #fedora-side-right {
+	top: 2px;
+	/* add to the top margin to compensate for the fixed sizes */
+	margin-top: 75px;
+	color: #555;
+	font-size: 0.9em;
+}
+#fedora-side-right ul {
+	list-style: square inside;
+	padding: 0;
+	margin: 0;
+}
+
+/* Left-side naviagation */
+#fedora-side-nav-label {
+	display: none;
+}
+#fedora-side-nav {
+	list-style: none;
+	margin: 0;
+	padding: 0;
+	border: 1px solid #5976b2;
+	border-top: 0;
+	background-color: #22437f;
+}
+#fedora-side-nav li {
+	margin: 0;
+	padding: 0;
+	border-top: 1px solid #5976b2;
+	/* IE/Win gets upset if there is no bottom border... Go figure. */
+	border-bottom: 1px solid #22437f;
+}
+#fedora-side-nav a {
+	margin: 0;
+	color: #c5ccdb;
+	display: block;
+	text-decoration: none;
+	padding: 4px 6px;
+}
+#fedora-side-nav a:hover {
+	background-color: #34548f;
+	color: #fff;
+}
+#fedora-side-nav ul {
+	list-style: none;
+	margin: 0;
+	padding: 0;
+}
+#fedora-side-nav ul li {
+	border-top: 1px solid #34548e;
+	background-color: #34548e;
+	/* IE/Win gets upset if there is no bottom border... Go figure. */
+	border-bottom: 1px solid #34548e;
+}
+#fedora-side-nav ul li:hover {
+	border-bottom: 1px solid #34548f;
+}
+#fedora-side-nav ul li a {
+	padding-left: 12px;
+	color: #a7b2c9;
+}
+#fedora-side-nav ul li a:hover {
+	background-color: #46659e;
+}
+#fedora-side-nav ul ul li a {
+	padding-left: 18px;
+}
+#fedora-side-nav strong a {
+	font-weight: normal;
+	color: #fff !important;
+	background-color: #10203b;
+}
+#fedora-side-nav strong a:hover {
+	background-color: #172e56 !important;
+}
+
+/* content containers */
+#fedora-middle-one, #fedora-middle-two, #fedora-middle-three {
+	font-size: 0.9em;
+	/* position: relative; */ /* relative to utilize z-index */
+	width: auto;
+	min-width: 120px;
+	margin: 10px;
+	z-index: 3; /* content can overlap when the browser is narrow */
+}
+/*
+#fedora-middle-two, #fedora-middle-three {
+	margin-left: 11em;
+	padding-left: 24px;
+}
+*/
+#fedora-middle-three {
+	margin-right: 20em;
+	padding-right: 24px;
+}
+
+#fedora-content {
+	padding: 24px;
+	border: 1px solid #aaa;
+	background-color: #fff;
+}
+
+#fedora-content > .fedora-corner-bottom { top: 0 }
+
+.fedora-corner-tl, .fedora-corner-tr, .fedora-corner-bl, .fedora-corner-br {
+	background-color: #d9d9d9;
+	position: relative;
+	width: 19px;
+	height: 19px;
+	/* The following line is to render PNGs with alpha transparency within IE/Win, using DirectX */
+	/* Work-around for IE6/Mac borkage (Part 1) */
+	display: none;
+}
+
+.fedora-corner-tl, .fedora-corner-bl { float: left; left: 0px; }
+.fedora-corner-tr, .fedora-corner-br { float: right; right: 0px; }
+.fedora-corner-tl, .fedora-corner-tr { top: 0px; }
+.fedora-corner-bl, .fedora-corner-br { bottom: 0px; margin-top: -19px; }
+
+
+html>body .fedora-corner-tl { background: #d9d9d9 url("../images/corner-tl.png") no-repeat left top; }
+html>body .fedora-corner-tr { background: #d9d9d9 url("../images/corner-tr.png") no-repeat right top; }
+html>body .fedora-corner-bl { background: #d9d9d9 url("../images/corner-bl.png") no-repeat left bottom; }
+html>body .fedora-corner-br { background: #d9d9d9 url("../images/corner-br.png") no-repeat right bottom; }
+
+.fedora-corner-tl { filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/corner-tl.png',sizingMethod='scale'); }
+.fedora-corner-tr { filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/corner-tr.png',sizingMethod='scale'); }
+.fedora-corner-br { filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/corner-br.png',sizingMethod='scale'); }
+.fedora-corner-bl { filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/corner-bl.png',sizingMethod='scale'); }
+
+/* \*/
+.fedora-corner-tl, .fedora-corner-tr, .fedora-corner-bl, .fedora-corner-br {
+	/* Restore the view for everything but IE6/Mac (part 2 of the "IE/Mac fix") */
+	display: block;
+}
+/* */
+
+html*.fedora-corner-bl, html*.fedora-corner-br {
+	/* Compensate for Opera's inability to position some things correctly (Part 2) */
+	top: 0px;
+}
+
+.content { margin: 0 1em }
+
+#fedora-sidelist {
+	position: relative;
+	bottom: 3px;
+	margin: 0;
+	padding: 3px !important;
+	border: 1px solid #bbb;
+	background-color: #ccc;
+	border-radius: 2.5px;
+	-moz-border-radius: 2.5px;
+}
+#fedora-sidelist strong a {
+	font-weight: normal;
+	background-color: #555;
+	color: #fff;
+}
+#fedora-sidelist strong a:hover {
+	background-color: #333;
+	color: #fff;
+}
+#fedora-sidelist li {
+	list-style-position: outside;
+	font-size: 0.9em;
+	list-style: none;
+	border: 1px solid #ccc;
+	border-width: 1px 0;
+	padding: 0;
+	list-style: none;
+}
+#fedora-sidelist li a {
+	text-decoration: none;
+	display: block;
+	padding: 6px 8px;
+	border-radius: 2.5px;
+	-moz-border-radius: 2.5px;
+}
+#fedora-sidelist li a:hover {
+	background-color: #999;
+	color: #eee;
+}
+
+#fedora-footer {
+	font-size: 0.75em;
+	text-align: center;
+	color: #777;
+	margin-bottom: 2em;
+}
+#fedora-printable {
+	text-align: center;
+	margin: 1em 0;
+	font-size: 0.85em;
+}
+#fedora-printable a {
+	text-decoration: none;
+	padding: 5px 0;
+	padding-left: 18px;
+	background: transparent url("../images/printable.png") no-repeat left;
+}
+#fedora-printable a:hover {
+	text-decoration: underline;
+}
+
+
+.left {
+	margin: 10px;
+	padding: 0px;
+	float: left;
+}
+
+.right {
+	margin: 10px;
+	padding: 0px;
+	float: right;
+}
+
+
+.blosxomStory p {
+	margin-top: 7px;
+	margin-bottom: 7px;
+}
\ No newline at end of file
diff --git a/roles/planet/files/sub-planets/security/css/people-style.css b/roles/planet/files/sub-planets/security/css/people-style.css
new file mode 100644
index 0000000000..9f95fc7535
--- /dev/null
+++ b/roles/planet/files/sub-planets/security/css/people-style.css
@@ -0,0 +1,169 @@
+html, body {
+	border: 0;
+	padding: 0;
+	margin: 0;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	min-width: 912px;
+	background-color: #eeeff1;
+}
+#header {
+	margin-bottom: 23px; /* sync this value with margin-top of #content */
+	background: #2963a5 url("../images/people-header.png") repeat-y 20% 0%;
+	height: 74px;
+}
+#header .logo {
+	position: absolute;
+	display: block;
+	left: 5px;
+	top: 3px;
+}
+#content {
+	margin-top: -23px;  /* sync this value with margin-top of #content */
+	margin-right: 210px;
+	background-color: white;
+}
+.blog-entries-daily {
+	background: white url("../images/people-entry-group-date-header.png") no-repeat top right;
+	margin-right: 25px;
+	position: relative;
+	padding-bottom: 12px;
+	margin-bottom: 30px;
+}
+.blog-date {
+	text-align: center;
+	background: transparent url("../images/people-entry-group-date-background.png") repeat-y top right;
+	color: white;
+	margin-top: 11px;
+	position: absolute;
+	right: 0;
+	font-size: 0.9em;
+	width: 229px;
+	height: 100%;
+}
+.blog-entry {
+	clear: both;
+	margin: 11px 0;
+	position: relative;
+	top: 40px;
+}
+.blog-entry-author {
+	float: left;
+	margin-top: 30px;
+	padding: 0 20px 30px 0;
+	width: 125px;
+	font-size: 0.8em;
+	text-align: center;
+}
+.blog-entry-author :link, .blog-entry-author :visited {
+	font-size: 0.9em;
+}
+.blog-entry-author .head {
+	display: block;
+	margin: 1ex auto;
+	border: 0;
+}
+.blog-entry-post {
+	margin: 1em 0 1em 145px;
+	border-radius: 20px;
+	background: transparent url("../images/people-entry-center-left.png") repeat-y center left;
+}
+.blog-entry-header {
+	background: transparent url("../images/people-entry-top-center.png") repeat-x top center;
+	height: 50px;
+}
+.blog-entry-title {
+	font-size: larger;
+	background: transparent url("../images/people-entry-top-left.png") no-repeat top left;
+	height: 50px;
+}
+.blog-entry-title a {
+	padding: 1em 0;
+	display: block;
+	margin-left: 25px;
+	background: transparent url("../images/people-entry-top-right.png") no-repeat top right;
+	height: 50px;
+}
+.blog-entry-content {
+	padding-top:10px;
+	padding-right: 3em;
+	margin-left: 25px;
+	text-align: justify;
+	font-size: 0.8em;
+	font-weight: normal;
+	background: transparent url("../images/people-entry-center-right.png") repeat-y center right;
+	padding-bottom:10px;
+	position: relative;
+	overflow: auto;
+}
+.blog-entry-content img {
+	max-width: 575px;
+	margin-left: 2ex;
+}
+.blog-entry-footer {
+	background: transparent url("../images/people-entry-bottom-center.png") repeat-x bottom center;
+}
+.blog-entry-timestamp {
+	font-size: x-small;
+	text-align: right;
+	color: #b3b3b3;
+	background: transparent url("../images/people-entry-bottom-left.png") no-repeat bottom left;
+}
+.blog-entry-timestamp a {
+	display: block;
+	color: #b3b3b3;
+	text-decoration: none;
+	height: 35px;
+	background: transparent url("../images/people-entry-bottom-right.png") no-repeat bottom right;
+	padding: 1em 5em 0 0;
+}
+#disclaimer {
+	font-size: x-small;
+	color: #b3b3b3;
+	text-align: center;
+	padding: 1em;
+}
+#sidebar {
+	color: #555555;
+	background-color: #eeeff1;
+	font-size: 0.8em;
+	position: absolute;
+	width: 210px;
+	min-width: 210px;
+	max-width: 210px;
+	top: 0;
+	right: 0;
+	margin: 0;
+	border-left: 2px solid white;
+	height: 100%;
+}
+#sidebar #sidebar-header {
+	display: block;
+	background-color: #2963a5;
+}
+#sidebar-inner {
+	padding: 10px;
+}
+#sidebar h2 {
+	font-size: 1.4em;
+	font-weight: normal;
+	border-bottom: 1px solid #cfd4d9;
+	margin: 5px 0px;
+	padding: 0px 5px;
+}
+
+#sidebar ul {
+	list-style: square inside;
+	padding: 0;
+	margin: 0 0 1em 0;
+	color: #22538b;
+}
+#spacer {
+	height: 1em;
+}
+:link {
+	color: #337ACC;
+}
+:visited {
+	color: #6A3B18;
+}
+
diff --git a/roles/planet/files/sub-planets/security/css/print.css b/roles/planet/files/sub-planets/security/css/print.css
new file mode 100644
index 0000000000..0be9beab70
--- /dev/null
+++ b/roles/planet/files/sub-planets/security/css/print.css
@@ -0,0 +1,86 @@
+body {
+	background: white;
+	color: black;
+	font-size: 10pt;
+	font-family: sans-serif;
+	line-height: 1.25em;
+}
+
+div {
+	border: 1px solid white;
+}
+li {
+	border: 1px solid white;
+	margin: 0;
+}
+li p {
+	display: inline;
+}
+
+h1 {
+	font-size: 16pt;
+}
+h2 {
+	font-size: 12pt;
+}
+h3,h4,h5 {
+	font-size: 10pt;
+}
+img {
+	border: 1px solid white;
+	background-color: white;
+}
+hr {
+	border: 1px dotted gray;
+	border-width: 0 0 1 0;
+	margin: 1em;
+}
+table {
+	border-collapse: collapse;
+}
+td,th {
+	border: 1px solid gray;
+	padding: 8pt;
+	font-size: 10pt;
+}
+th {
+	font-weight: bold;
+}
+#fedora-header, #fedora-footer {
+	text-align: center;
+}
+#fedora-header-items, #fedora-side-left, #fedora-side-right {
+	display: none;
+}
+
+#fedora-project-download dt {
+	font-weight: bold;
+	margin-top: 8pt;
+	margin-left: 5pt;
+}
+#fedora-project-download dd {
+	padding: 0;
+	margin: 10px 20px 0;
+}
+
+code.screen, pre.screen {
+	font-family: monospace;
+	font-size: 1em;
+	display: block;
+	padding: 5pt;
+	border: 1px dashed gray;
+	margin: 0.5em 2em;
+}
+#fedora-project code.screen {
+	margin: 0;
+}
+
+/*
+#fedora-content a:link:after, #fedora-content a:visited:after {
+	content: " (" attr(href) ") ";
+	font-size: 80%;
+}
+*/
+.navheader table, .navheader table td {
+	border: 0 !important;
+}
diff --git a/roles/planet/files/sub-planets/security/fpbuilder.conf b/roles/planet/files/sub-planets/security/fpbuilder.conf
new file mode 100644
index 0000000000..20aabe02e3
--- /dev/null
+++ b/roles/planet/files/sub-planets/security/fpbuilder.conf
@@ -0,0 +1,5 @@
+[main]
+base_config=/etc/planet/security/base_config
+output=/srv/planet/site/security/planet.ini
+group=security
+
diff --git a/roles/planet/files/sub-planets/security/images/blue.png b/roles/planet/files/sub-planets/security/images/blue.png
new file mode 100644
index 0000000000..6987cab624
Binary files /dev/null and b/roles/planet/files/sub-planets/security/images/blue.png differ
diff --git a/roles/planet/files/sub-planets/security/images/corner-bl.png b/roles/planet/files/sub-planets/security/images/corner-bl.png
new file mode 100644
index 0000000000..58d269c306
Binary files /dev/null and b/roles/planet/files/sub-planets/security/images/corner-bl.png differ
diff --git a/roles/planet/files/sub-planets/security/images/corner-br.png b/roles/planet/files/sub-planets/security/images/corner-br.png
new file mode 100644
index 0000000000..c03dd92bec
Binary files /dev/null and b/roles/planet/files/sub-planets/security/images/corner-br.png differ
diff --git a/roles/planet/files/sub-planets/security/images/corner-tl.png b/roles/planet/files/sub-planets/security/images/corner-tl.png
new file mode 100644
index 0000000000..08ab7a3ac2
Binary files /dev/null and b/roles/planet/files/sub-planets/security/images/corner-tl.png differ
diff --git a/roles/planet/files/sub-planets/security/images/corner-tr.png b/roles/planet/files/sub-planets/security/images/corner-tr.png
new file mode 100644
index 0000000000..b279db2961
Binary files /dev/null and b/roles/planet/files/sub-planets/security/images/corner-tr.png differ
diff --git a/roles/planet/files/sub-planets/security/images/favicon.ico b/roles/planet/files/sub-planets/security/images/favicon.ico
new file mode 100644
index 0000000000..d1ae2d209a
Binary files /dev/null and b/roles/planet/files/sub-planets/security/images/favicon.ico differ
diff --git a/roles/planet/files/sub-planets/security/images/header-download.png b/roles/planet/files/sub-planets/security/images/header-download.png
new file mode 100644
index 0000000000..a1cf3e577e
Binary files /dev/null and b/roles/planet/files/sub-planets/security/images/header-download.png differ
diff --git a/roles/planet/files/sub-planets/security/images/header-faq.png b/roles/planet/files/sub-planets/security/images/header-faq.png
new file mode 100644
index 0000000000..1e7c3c95d3
Binary files /dev/null and b/roles/planet/files/sub-planets/security/images/header-faq.png differ
diff --git a/roles/planet/files/sub-planets/security/images/header-fedora_logo.png b/roles/planet/files/sub-planets/security/images/header-fedora_logo.png
new file mode 100644
index 0000000000..552f201643
Binary files /dev/null and b/roles/planet/files/sub-planets/security/images/header-fedora_logo.png differ
diff --git a/roles/planet/files/sub-planets/security/images/header-projects.png b/roles/planet/files/sub-planets/security/images/header-projects.png
new file mode 100644
index 0000000000..aad307edd2
Binary files /dev/null and b/roles/planet/files/sub-planets/security/images/header-projects.png differ
diff --git a/roles/planet/files/sub-planets/security/images/heads/default.png b/roles/planet/files/sub-planets/security/images/heads/default.png
new file mode 100644
index 0000000000..407185b503
Binary files /dev/null and b/roles/planet/files/sub-planets/security/images/heads/default.png differ
diff --git a/roles/planet/files/sub-planets/security/images/intro-computer.png b/roles/planet/files/sub-planets/security/images/intro-computer.png
new file mode 100644
index 0000000000..9298aecea3
Binary files /dev/null and b/roles/planet/files/sub-planets/security/images/intro-computer.png differ
diff --git a/roles/planet/files/sub-planets/security/images/intro-download.png b/roles/planet/files/sub-planets/security/images/intro-download.png
new file mode 100644
index 0000000000..c77db0be2d
Binary files /dev/null and b/roles/planet/files/sub-planets/security/images/intro-download.png differ
diff --git a/roles/planet/files/sub-planets/security/images/logo-spacer.png b/roles/planet/files/sub-planets/security/images/logo-spacer.png
new file mode 100644
index 0000000000..a104f5535f
Binary files /dev/null and b/roles/planet/files/sub-planets/security/images/logo-spacer.png differ
diff --git a/roles/planet/files/sub-planets/security/images/logo.png b/roles/planet/files/sub-planets/security/images/logo.png
new file mode 100644
index 0000000000..f277bf9281
Binary files /dev/null and b/roles/planet/files/sub-planets/security/images/logo.png differ
diff --git a/roles/planet/files/sub-planets/security/images/mainBack.png b/roles/planet/files/sub-planets/security/images/mainBack.png
new file mode 100644
index 0000000000..1372780be6
Binary files /dev/null and b/roles/planet/files/sub-planets/security/images/mainBack.png differ
diff --git a/roles/planet/files/sub-planets/security/images/people-entry-bottom-center.png b/roles/planet/files/sub-planets/security/images/people-entry-bottom-center.png
new file mode 100644
index 0000000000..8d8ee6ace4
Binary files /dev/null and b/roles/planet/files/sub-planets/security/images/people-entry-bottom-center.png differ
diff --git a/roles/planet/files/sub-planets/security/images/people-entry-bottom-left.png b/roles/planet/files/sub-planets/security/images/people-entry-bottom-left.png
new file mode 100644
index 0000000000..1aadc48c53
Binary files /dev/null and b/roles/planet/files/sub-planets/security/images/people-entry-bottom-left.png differ
diff --git a/roles/planet/files/sub-planets/security/images/people-entry-bottom-right.png b/roles/planet/files/sub-planets/security/images/people-entry-bottom-right.png
new file mode 100644
index 0000000000..047c9081f9
Binary files /dev/null and b/roles/planet/files/sub-planets/security/images/people-entry-bottom-right.png differ
diff --git a/roles/planet/files/sub-planets/security/images/people-entry-center-left.png b/roles/planet/files/sub-planets/security/images/people-entry-center-left.png
new file mode 100644
index 0000000000..9da8d17866
Binary files /dev/null and b/roles/planet/files/sub-planets/security/images/people-entry-center-left.png differ
diff --git a/roles/planet/files/sub-planets/security/images/people-entry-center-right.png b/roles/planet/files/sub-planets/security/images/people-entry-center-right.png
new file mode 100644
index 0000000000..379c8c0671
Binary files /dev/null and b/roles/planet/files/sub-planets/security/images/people-entry-center-right.png differ
diff --git a/roles/planet/files/sub-planets/security/images/people-entry-group-date-background.png b/roles/planet/files/sub-planets/security/images/people-entry-group-date-background.png
new file mode 100644
index 0000000000..f029a675a4
Binary files /dev/null and b/roles/planet/files/sub-planets/security/images/people-entry-group-date-background.png differ
diff --git a/roles/planet/files/sub-planets/security/images/people-entry-group-date-header.png b/roles/planet/files/sub-planets/security/images/people-entry-group-date-header.png
new file mode 100644
index 0000000000..47ee607a41
Binary files /dev/null and b/roles/planet/files/sub-planets/security/images/people-entry-group-date-header.png differ
diff --git a/roles/planet/files/sub-planets/security/images/people-entry-top-center.png b/roles/planet/files/sub-planets/security/images/people-entry-top-center.png
new file mode 100644
index 0000000000..6b3b33aebf
Binary files /dev/null and b/roles/planet/files/sub-planets/security/images/people-entry-top-center.png differ
diff --git a/roles/planet/files/sub-planets/security/images/people-entry-top-left.png b/roles/planet/files/sub-planets/security/images/people-entry-top-left.png
new file mode 100644
index 0000000000..007a1e2850
Binary files /dev/null and b/roles/planet/files/sub-planets/security/images/people-entry-top-left.png differ
diff --git a/roles/planet/files/sub-planets/security/images/people-entry-top-right.png b/roles/planet/files/sub-planets/security/images/people-entry-top-right.png
new file mode 100644
index 0000000000..bfb41fb2a2
Binary files /dev/null and b/roles/planet/files/sub-planets/security/images/people-entry-top-right.png differ
diff --git a/roles/planet/files/sub-planets/security/images/people-header.png b/roles/planet/files/sub-planets/security/images/people-header.png
new file mode 100644
index 0000000000..d1fcbbc3c1
Binary files /dev/null and b/roles/planet/files/sub-planets/security/images/people-header.png differ
diff --git a/roles/planet/files/sub-planets/security/images/people-logo.png b/roles/planet/files/sub-planets/security/images/people-logo.png
new file mode 100644
index 0000000000..6404e088f1
Binary files /dev/null and b/roles/planet/files/sub-planets/security/images/people-logo.png differ
diff --git a/roles/planet/files/sub-planets/security/images/people-sidebar-header.png b/roles/planet/files/sub-planets/security/images/people-sidebar-header.png
new file mode 100644
index 0000000000..c82025672e
Binary files /dev/null and b/roles/planet/files/sub-planets/security/images/people-sidebar-header.png differ
diff --git a/roles/planet/files/sub-planets/security/images/planet.png b/roles/planet/files/sub-planets/security/images/planet.png
new file mode 100644
index 0000000000..9606a0c30d
Binary files /dev/null and b/roles/planet/files/sub-planets/security/images/planet.png differ
diff --git a/roles/planet/files/sub-planets/security/planet-group.cron b/roles/planet/files/sub-planets/security/planet-group.cron
new file mode 100644
index 0000000000..70f49c7502
--- /dev/null
+++ b/roles/planet/files/sub-planets/security/planet-group.cron
@@ -0,0 +1,2 @@
+*/20 * * * * planet-user bash /usr/local/bin/pull-run-planet-config.sh /etc/planet/security/fpbuilder.conf >>/dev/null 2>&1
+10 4 * * * *  planet-user /usr/sbin/tmpwatch 360 /srv/planet/config/security/cache >>/dev/null
\ No newline at end of file
diff --git a/roles/planet/files/sub-planets/security/templates/atom.xml.tmpl b/roles/planet/files/sub-planets/security/templates/atom.xml.tmpl
new file mode 100644
index 0000000000..23a6f43798
--- /dev/null
+++ b/roles/planet/files/sub-planets/security/templates/atom.xml.tmpl
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+
+	<title><TMPL_VAR name></title>
+	<link rel="self" href="<TMPL_VAR feed ESCAPE="HTML">"/>
+	<link href="<TMPL_VAR link ESCAPE="HTML">"/>
+	<id><TMPL_VAR feed ESCAPE="HTML"></id>
+	<updated><TMPL_VAR date_iso></updated>
+	<generator uri="http://planet.fedoraproject.org/security/"><TMPL_VAR generator ESCAPE="HTML"></generator>
+
+<TMPL_LOOP Items>
+	<entry<TMPL_IF channel_language> xml:lang="<TMPL_VAR channel_language>"</TMPL_IF>>
+		<title type="html"<TMPL_IF title_language> xml:lang="<TMPL_VAR title_language>"</TMPL_IF>><TMPL_VAR title ESCAPE="HTML"></title>
+		<link href="<TMPL_VAR link ESCAPE="HTML">"/>
+		<id><TMPL_VAR id ESCAPE="HTML"></id>
+		<updated><TMPL_VAR date_iso></updated>
+		<content type="html"<TMPL_IF content_language> xml:lang="<TMPL_VAR content_language>"</TMPL_IF>>
+                <TMPL_IF channel_face>
+			&lt;img src=&quot;<TMPL_VAR channel_face ESCAPE="HTML">&quot; <TMPL_IF channel_facewidth>width=&quot;<TMPL_VAR channel_facewidth>&quot; </TMPL_IF><TMPL_IF channel_faceheight>height=&quot;<TMPL_VAR channel_faceheight>&quot; </TMPL_IF> alt=&quot;&quot; style=&quot;float: right;&quot;&gt;
+		</TMPL_IF> <TMPL_VAR content ESCAPE="HTML"></content>
+		<author>
+<TMPL_IF author_name>
+			<name><TMPL_VAR author_name ESCAPE="HTML"></name>
+<TMPL_IF author_email>
+			<email><TMPL_VAR author_email ESCAPE="HTML"></email>
+</TMPL_IF author_email>
+<TMPL_ELSE>
+<TMPL_IF channel_author_name>
+			<name><TMPL_VAR channel_author_name ESCAPE="HTML"></name>
+<TMPL_IF channel_author_email>
+			<email><TMPL_VAR channel_author_email ESCAPE="HTML"></email>
+</TMPL_IF channel_author_email>
+<TMPL_ELSE>
+			<name><TMPL_VAR channel_name ESCAPE="HTML"></name>
+</TMPL_IF>
+</TMPL_IF>
+			<uri><TMPL_VAR channel_link ESCAPE="HTML"></uri>
+		</author>
+		<source>
+<TMPL_IF channel_title>
+			<title type="html"><TMPL_VAR channel_title ESCAPE="HTML"></title>
+<TMPL_ELSE>
+			<title type="html"><TMPL_VAR channel_name ESCAPE="HTML"></title>
+</TMPL_IF>
+<TMPL_IF channel_subtitle>
+			<subtitle type="html"><TMPL_VAR channel_subtitle ESCAPE="HTML"></subtitle>
+</TMPL_IF>
+			<link rel="self" href="<TMPL_VAR channel_url ESCAPE="HTML">"/>
+<TMPL_IF channel_id>
+			<id><TMPL_VAR channel_id ESCAPE="HTML"></id>
+<TMPL_ELSE>
+			<id><TMPL_VAR channel_url ESCAPE="HTML"></id>
+</TMPL_IF>
+<TMPL_IF channel_updated_iso>
+			<updated><TMPL_VAR channel_updated_iso></updated>
+</TMPL_IF>
+<TMPL_IF channel_rights>
+			<rights type="html"><TMPL_VAR channel_rights ESCAPE="HTML"></rights>
+</TMPL_IF>
+		</source>
+	</entry>
+
+</TMPL_LOOP>
+</feed>
diff --git a/roles/planet/files/sub-planets/security/templates/foafroll.xml.tmpl b/roles/planet/files/sub-planets/security/templates/foafroll.xml.tmpl
new file mode 100644
index 0000000000..b2cecf3548
--- /dev/null
+++ b/roles/planet/files/sub-planets/security/templates/foafroll.xml.tmpl
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<rdf:RDF
+	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+	xmlns:foaf="http://xmlns.com/foaf/0.1/"
+	xmlns:rss="http://purl.org/rss/1.0/"
+	xmlns:dc="http://purl.org/dc/elements/1.1/"
+>
+<foaf:Group>
+	<foaf:name><TMPL_VAR name></foaf:name>
+	<foaf:homepage><TMPL_VAR link></foaf:homepage>
+	<rdfs:seeAlso rdf:resource="<TMPL_VAR uri ESCAPE="HTML">" />
+
+<TMPL_LOOP Channels>
+	<foaf:member>
+		<foaf:Agent>
+			<foaf:name><TMPL_VAR name></foaf:name>
+			<foaf:weblog>
+				<foaf:Document rdf:about="<TMPL_VAR link ESCAPE="HTML">">
+					<dc:title><TMPL_VAR title></dc:title>
+					<rdfs:seeAlso>
+						<rss:channel rdf:about="<TMPL_VAR uri ESCAPE="HTML">" />
+					</rdfs:seeAlso>
+				</foaf:Document>
+			</foaf:weblog>
+		</foaf:Agent>
+	</foaf:member>
+</TMPL_LOOP>
+
+</foaf:Group>
+</rdf:RDF>
diff --git a/roles/planet/files/sub-planets/security/templates/heads.html.tmpl b/roles/planet/files/sub-planets/security/templates/heads.html.tmpl
new file mode 100644
index 0000000000..c1d95d4c80
--- /dev/null
+++ b/roles/planet/files/sub-planets/security/templates/heads.html.tmpl
@@ -0,0 +1,97 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<title>Planet Fedora security</title>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8">
+    <meta http-equiv="Content-Type" content="text/html">
+    <meta name="MSSmartTagsPreventParsing" content="TRUE">
+    <link rel="stylesheet" type="text/css" media="print" href="http://planet.fedoraproject.org/css/print.css">
+    <link rel="stylesheet" type="text/css" media="all" href="http://fedoraproject.org/static/css/fedora.css">
+    <link rel="stylesheet" type="text/css" media="all" href="/css/fedora_planet.css">
+    <link rel="shortcut icon" href="/images/favicon.ico">
+    <link rel="icon" href="/images/favicon.ico">
+    <style type="text/css">
+        #content ul {
+            overflow: auto;
+            list-style: none;
+        }
+        #content ul li {
+            height: 160px;
+            float: left;
+            text-align: center;
+            margin: 1em;
+        }
+        #content ul li img {
+            display: block;
+            margin: 0 auto;
+        }
+    </style>
+</head>
+<body class="home">
+    <div id="wrapper">
+
+        <div id="head">
+            <h1><a href="http://fedoraproject.org/">Fedora</a></h1>
+        </div>
+
+        <div id="sidebar">
+            <div id="planet_nav">
+
+                <h2>Feeds</h2>
+                <a href="rss10.xml">RSS 1.0</a><br>
+                <a href="rss20.xml">RSS 2.0</a><br>
+                <a href="atom.xml">Atom 1.0</a><br>
+                <a href="foafroll.xml">FOAF blogroll</a><br>
+
+                <h2>Links</h2>
+                <ul>
+                    <li><a href="http://fedoraproject.org">Fedora Home</a></li>
+                    <li><a href="http://fedoranews.org">Fedora News</a></li>
+                    <li><a href="http://planet.fedoraproject.org/heads/">Hackergotchi Heads</a></li>
+                    <li><a href="http://fedoraproject.org/infofeed/">Fedora Info</a></li>
+                </ul>
+
+                <h2>People</h2>
+                <ul id="people_feeds">
+
+                <TMPL_LOOP Channels>
+                    <li><a href="<TMPL_VAR url ESCAPE="HTML">"><img src="/images/rss.png" alt="RSS"></a><a href="<TMPL_VAR link>" title="<TMPL_VAR title>"><TMPL_VAR name></a></li>
+                </TMPL_LOOP>
+                </ul>
+
+                <h2>Add your blog</h2>
+                <ul><li><a href="http://fedoraproject.org/wiki/Planet_HowTo">Add your blog</a></li></ul>
+		<ul><li><div class="fedora_planet">"The content on this page is provided by Fedora contributors, and represents their individual viewpoints, and not necessarily those of the Fedora Project or any of its sponsors or other members."</div></a></li></ul>
+            </div>
+        </div>
+
+
+        <div id="content">
+            <div class="spacer">
+            </div> <!-- :-} -->
+<ul>
+<TMPL_LOOP Channels>
+<!--<li class="head"><TMPL_IF link><a href="<TMPL_VAR link>" title="<TMPL_VAR title>"></TMPL_IF><img src="<TMPL_VAR face ESCAPE="HTML">" <TMPL_IF facewidth>width="<TMPL_VAR facewidth>" </TMPL_IF><TMPL_IF faceheight>height="<TMPL_VAR faceheight>" </TMPL_IF>alt="" /><TMPL_VAR name><TMPL_IF link></a></TMPL_IF></li>-->
+<li class="head"><TMPL_IF link><a href="<TMPL_VAR link ESCAPE="HTML">" title="<TMPL_VAR title>"></TMPL_IF><img src="<TMPL_VAR face ESCAPE="HTML">" /><TMPL_VAR name><TMPL_IF link></a></TMPL_IF></li>
+</TMPL_LOOP>
+</ul>
+
+    </div>
+</div>
+    <div id="bottom">
+        <div id="footer">
+            <p class="copy">&copy; 2010 Red Hat, Inc. and others.  Please send any comments or corrections to the <a href="mailto:webmaster@fedoraproject.org">websites team</a>.</p>
+            <p class="disclaimer">The Fedora Project is maintained and driven by the community and sponsored by Red Hat.  This is a community maintained site.  Red Hat is not responsible for content.</p>
+            <p class="disclaimer">Your words are your own, duh. Nothing here represents Fedora™, Red Hat, Inc, or pretty much anything else. If you think it does then you are badly misled</p>
+            <ul>
+                <li class="first"><a href="/en/sponsors">Sponsors</a></li>
+                <li><a href="http://fedoraproject.org/wiki/Legal">Legal</a></li>
+                <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a></li>
+            </ul>
+        </div>
+    </div>
+
+
+</body>
+</html>
diff --git a/roles/planet/files/sub-planets/security/templates/index.html.tmpl b/roles/planet/files/sub-planets/security/templates/index.html.tmpl
new file mode 100644
index 0000000000..d521f1de1d
--- /dev/null
+++ b/roles/planet/files/sub-planets/security/templates/index.html.tmpl
@@ -0,0 +1,112 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<title>Planet Fedora security</title>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8">
+    <meta http-equiv="Content-Type" content="text/html">
+    <meta name="MSSmartTagsPreventParsing" content="TRUE">
+    <link rel="stylesheet" type="text/css" media="print" href="http://planet.fedoraproject.org/css/print.css">
+    <link rel="stylesheet" type="text/css" media="all" href="http://fedoraproject.org/static/css/fedora.css">
+    <link rel="stylesheet" type="text/css" media="all" href="/css/fedora_planet.css">
+    <link rel="shortcut icon" href="/images/favicon.ico">
+    <link rel="icon" href="/images/favicon.ico">
+    <link rel="alternate" type="application/xml" title="RSS" href="http://planet.fedoraproject.org/security/rss20.xml">
+    <link rel="alternate" type="application/atom+xml" title="Fedora People Atom 1.0" href="http://planet.fedoraproject.org/security/atom.xml">
+</head>
+<body class="home">
+    <div id="wrapper">
+
+        <div id="head">
+            <h1><a href="http://fedoraproject.org/">Fedora</a></h1>
+        </div>
+
+        <div id="sidebar">
+            <div id="planet_nav">
+
+                <h2>Feeds</h2>
+                <a href="rss10.xml">RSS 1.0</a><br>
+                <a href="rss20.xml">RSS 2.0</a><br>
+                <a href="atom.xml">Atom 1.0</a><br>
+                <a href="foafroll.xml">FOAF blogroll</a><br>
+
+                <h2>Links</h2>
+                <ul>
+                    <li><a href="http://fedoraproject.org">Fedora Home</a></li>
+                    <li><a href="http://fedoranews.org">Fedora News</a></li>
+                    <li><a href="http://fedoraproject.org/infofeed/">Fedora Info</a></li>
+                </ul>
+
+                <h2>People</h2>
+                <ul id="people_feeds">
+
+                <TMPL_LOOP Channels>
+                    <li><a href="<TMPL_VAR url ESCAPE="HTML">"><img src="images/rss.png" alt="RSS"></a><a href="<TMPL_VAR link ESCAPE="HTML">" title="<TMPL_VAR title ESCAPE="HTML">"><TMPL_VAR name ESCAPE="HTML"></a></li>
+                </TMPL_LOOP>
+                </ul>
+
+                <h2>Add your blog</h2>
+                <ul><li><a href="http://fedoraproject.org/wiki/Planet_HowTo">Add your blog</a></li></ul>
+		<ul><li><div class="fedora_planet">"The content on this page is provided by Fedora contributors, and represents their individual viewpoints, and not necessarily those of the Fedora Project or any of its sponsors or other members."</div></a></li></ul>
+            </div>
+        </div>
+
+
+        <div id="content">
+            <div class="spacer">
+        <TMPL_LOOP Items>
+
+            <TMPL_IF new_date>
+            </div> <!-- :-} -->
+
+            <div class="blog-entries-daily">
+            <h2 class="blog-date"><TMPL_VAR new_date></h2>
+            </TMPL_IF>
+
+
+            <div class="blog-entry <TMPL_VAR channel_name>">
+                <div class="blog-entry-post">
+                    <div class="blog-entry-header">
+                        <div class="blog-entry-author">
+
+                            <TMPL_IF channel_face>
+                                <img src="<TMPL_VAR channel_face ESCAPE="HTML">" <TMPL_IF channel_facewidth>width="<TMPL_VAR channel_facewidth>" </TMPL_IF><TMPL_IF channel_faceheight>height="<TMPL_VAR channel_faceheight>" </TMPL_IF>alt="">
+                                <br><a href="<TMPL_VAR channel_link ESCAPE="HTML">"><TMPL_VAR channel_name></a>
+
+                            </TMPL_IF>
+
+                        </div>
+
+                        <div class="blog-entry-title"><a href="<TMPL_VAR link>"><TMPL_IF title><TMPL_VAR title><TMPL_ELSE>Untitled Post</TMPL_IF></a></div>
+                    </div>
+
+                    <div class="blog-entry-content-container">
+
+                        <div class="blog-entry-content"><TMPL_VAR content></div>
+
+                    </div>
+                    <div class="blog-entry-footer">
+                    <div class="blog-entry-timestamp"><a href="<TMPL_VAR link ESCAPE="HTML">"><TMPL_IF creator>by <TMPL_VAR creator> at </TMPL_IF><TMPL_VAR date></a></div>
+                    </div>
+                </div>
+            </div>
+    </TMPL_LOOP>
+        </div>
+    </div>
+</div>
+    <div id="bottom">
+        <div id="footer">
+            <p class="copy">&copy; 2010 Red Hat, Inc. and others.  Please send any comments or corrections to the <a href="mailto:webmaster@fedoraproject.org">websites team</a>.</p>
+            <p class="disclaimer">The Fedora Project is maintained and driven by the community and sponsored by Red Hat.  This is a community maintained site.  Red Hat is not responsible for content.</p>
+            <p class="disclaimer">Your words are your own, duh. Nothing here represents Fedora™, Red Hat, Inc, or pretty much anything else. If you think it does then you are badly misled</p>
+            <ul>
+                <li class="first"><a href="/en/sponsors">Sponsors</a></li>
+                <li><a href="http://fedoraproject.org/wiki/Legal">Legal</a></li>
+                <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a></li>
+            </ul>
+        </div>
+    </div>
+
+
+</body>
+</html>
diff --git a/roles/planet/files/sub-planets/security/templates/opml.xml.tmpl b/roles/planet/files/sub-planets/security/templates/opml.xml.tmpl
new file mode 100644
index 0000000000..aaa8833810
--- /dev/null
+++ b/roles/planet/files/sub-planets/security/templates/opml.xml.tmpl
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<opml version="1.1">
+	<head>
+		<title><TMPL_VAR name></title>
+		<dateCreated><TMPL_VAR date_822></dateCreated>
+		<dateModified><TMPL_VAR date_822></dateModified>
+		<ownerName><TMPL_VAR owner_name></ownerName>
+		<ownerEmail><TMPL_VAR owner_email></ownerEmail>
+	</head>
+	
+	<body>
+		<TMPL_LOOP Channels>
+		<outline text="<TMPL_VAR name ESCAPE="HTML">" xmlUrl="<TMPL_VAR url ESCAPE="HTML">"/>
+		</TMPL_LOOP>
+	</body>
+</opml>
diff --git a/roles/planet/files/sub-planets/security/templates/rss10.xml.tmpl b/roles/planet/files/sub-planets/security/templates/rss10.xml.tmpl
new file mode 100644
index 0000000000..5b7b84ba93
--- /dev/null
+++ b/roles/planet/files/sub-planets/security/templates/rss10.xml.tmpl
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<rdf:RDF
+	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	xmlns:dc="http://purl.org/dc/elements/1.1/"
+	xmlns:foaf="http://xmlns.com/foaf/0.1/"
+	xmlns:content="http://purl.org/rss/1.0/modules/content/"
+	xmlns="http://purl.org/rss/1.0/"
+>
+<channel rdf:about="<TMPL_VAR link ESCAPE="HTML">">
+	<title><TMPL_VAR name></title>
+    <link><TMPL_VAR link ESCAPE="HTML"></link>
+        <description>Fedora People: http://planet.fedoraproject.org/security</description>
+	<items>
+		<rdf:Seq>
+<TMPL_LOOP Items>
+			<rdf:li rdf:resource="<TMPL_VAR id ESCAPE="HTML">" />
+</TMPL_LOOP>
+		</rdf:Seq>
+	</items>
+</channel>
+
+<TMPL_LOOP Items>
+<item rdf:about="<TMPL_VAR id ESCAPE="HTML">">
+	<title><TMPL_VAR channel_name><TMPL_IF title>: <TMPL_VAR title></TMPL_IF></title>
+    <link><TMPL_VAR link ESCAPE="HTML"></link>
+	<TMPL_IF content>
+	<content:encoded><TMPL_VAR content ESCAPE="HTML"></content:encoded>
+	</TMPL_IF>
+	<dc:date><TMPL_VAR date_iso></dc:date>
+</item>
+</TMPL_LOOP>
+
+</rdf:RDF>
diff --git a/roles/planet/files/sub-planets/security/templates/rss20.xml.tmpl b/roles/planet/files/sub-planets/security/templates/rss20.xml.tmpl
new file mode 100644
index 0000000000..0db2b4a43f
--- /dev/null
+++ b/roles/planet/files/sub-planets/security/templates/rss20.xml.tmpl
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
+<channel>
+   <atom:link href="http://planet.fedoraproject.org/security/rss20.xml" rel="self" type="application/rss+xml" />
+	<title><TMPL_VAR name></title>
+	<link><TMPL_VAR link></link>
+	<language>en</language>
+        <description>Fedora People: http://planet.fedoraproject.org/security</description>
+
+<TMPL_LOOP Items>
+<item>
+	<title><TMPL_VAR channel_name><TMPL_IF title>: <TMPL_VAR title></TMPL_IF></title>
+	<guid isPermaLink="false"><TMPL_VAR id ESCAPE="HTML"></guid>
+	<link><TMPL_VAR link ESCAPE="HTML"></link>
+	<TMPL_IF content>
+
+	<description>
+		<TMPL_IF channel_face>
+			&lt;img src=&quot;<TMPL_VAR channel_face ESCAPE="HTML">&quot; <TMPL_IF channel_facewidth>width=&quot;<TMPL_VAR channel_facewidth>&quot; </TMPL_IF><TMPL_IF channel_faceheight>height=&quot;<TMPL_VAR channel_faceheight>&quot; </TMPL_IF> alt=&quot;&quot; style=&quot;float: right;&quot;&gt;
+		</TMPL_IF>
+		<TMPL_VAR content ESCAPE="HTML"></description>
+	</TMPL_IF>
+	<pubDate><TMPL_VAR date_822></pubDate>
+</item>
+</TMPL_LOOP>
+
+</channel>
+</rss>
diff --git a/roles/planet/files/sub-planets/summer-coding/base_config b/roles/planet/files/sub-planets/summer-coding/base_config
new file mode 100644
index 0000000000..f3b69058fc
--- /dev/null
+++ b/roles/planet/files/sub-planets/summer-coding/base_config
@@ -0,0 +1,26 @@
+[Planet]
+name = Fedora summer-coding Planet
+link = http://planet.fedoraproject.org/summer-coding/
+owner_name = Fedora Admin
+owner_email = admin@fedoraproject.org
+cache_directory = /srv/planet/config/summer-coding/cache
+template_files = /srv/planet/config/summer-coding/templates/index.html.tmpl /srv/planet/config/summer-coding/templates/rss20.xml.tmpl /srv/planet/config/summer-coding/templates/rss10.xml.tmpl //srv/planet/config/summer-coding/templates/opml.xml.tmpl ///srv/planet/config/summer-coding/templates/foafroll.xml.tmpl ////srv/planet/config/summer-coding/templates/atom.xml.tmpl /////srv/planet/config/summer-coding/templates/heads.html.tmpl 
+output_dir = /srv/planet/site/summer-coding
+items_per_page = 50
+log_level = ERROR
+date_format = %B %d, %Y %I:%M %p
+spider_threads=20
+#
+#     [DEFAULT]
+#     facewidth = 64
+#     faceheight = 64
+#
+#     [http://www.blog.com/rss]
+#     face = foo.png
+#     faceheight = 32
+#
+# The facewidth of the defined blog defaults to 64.
+
+[DEFAULT]
+face = http://planet.fedoraproject.org/summer-coding/images/heads/default.png
+
diff --git a/roles/planet/files/sub-planets/summer-coding/css/content.css b/roles/planet/files/sub-planets/summer-coding/css/content.css
new file mode 100644
index 0000000000..982924ee61
--- /dev/null
+++ b/roles/planet/files/sub-planets/summer-coding/css/content.css
@@ -0,0 +1,237 @@
+.name-project, .name-release, .name-version {
+}
+
+/* Front page H1 */
+#page-main h1 {
+	font-size: 1.35em;
+}
+
+#page-main h1.center {
+	text-align: center;
+}
+
+h1, h2, h3, h4 {
+	/*
+	font-style: italic;
+	*/
+	font-family: luxi sans,sans-serif;
+}
+h1 {
+	font-size: 1.75em;
+}
+
+h2 {
+	font-size: 1.25em;
+#	background-color: #eee;
+}
+
+h3 {
+	font-size: 1.1em;
+}
+
+hr {
+	border: 0;
+	border-bottom: 1px solid #ccc;
+}
+
+.fedora-side-right-content {
+	padding: 1 5px 1.5em;
+	font-size: 1em;
+}
+#fedora-side-right h1, #fedora-side-right h2, #fedora-side-right h3 {
+	margin: 0;
+	padding: 0 4pt 0;
+	font-size: 1em;
+	letter-spacing: 2pt;
+	border-bottom: 1px solid #bbb;
+}
+#fedora-side-right hr {
+	border-bottom: 1px solid #aaa;
+	margin: 0.5em 0;
+}
+
+table tr {
+	font-size: 0.9em; 
+}
+
+
+#link-offsite {
+}
+.link-offsite-notation {
+	font-size: 0.9em;
+	color: #777;
+	padding-left: 1pt;
+	text-decoration: none !important;
+}
+#fedora-content .link-offsite-notation {
+	color: #999;
+}
+#link-redhat {
+}
+#fedora-content #link-redhat {
+}
+#link-internal {
+}
+
+#fedora-content li {
+	padding: 1pt;
+}
+#fedora-content h1 {
+	margin-top: 0;
+}
+
+#fedora-content a img {
+	margin: 1px;
+	border: 0;
+}
+#fedora-content a:hover img {
+	margin: 0;
+	border: 1px solid #f00;
+}
+#fedora-content a img.noborder {
+	margin: 0;
+	border: 0;
+}
+#fedora-content a:hover img .noborder {
+	margin: 0;
+	border: 0;
+}
+
+#fedora-project-maintainers p, #fedora-project-contributors p, #fedora-project-bugs p {
+	margin-left: 5pt;
+}
+
+#fedora-project-download dt {
+	font-weight: bold;
+	margin-top: 8pt;
+	margin-left: 5pt;
+}
+#fedora-project-download dd {
+	padding: 0;
+	margin: 10px 20px 0;
+}
+#fedora-project-screenshots a img {
+	margin: 5px;
+}
+#fedora-project-screenshots a:hover img {
+	margin: 4px;
+}
+#fedora-project-todo ul {
+	border: 1px solid #cad4e9;
+	margin: 0 1em;
+	padding: 0;
+	list-style: none;
+	border-radius: 2.5px;
+	-moz-border-radius: 2.5px;
+}
+#fedora-project-todo li {
+	margin: 0;
+	padding: 6px 8px;
+}
+#fedora-project-todo li.odd {
+	background-color: #ecf0f7;
+}
+#fedora-project-todo li.even {
+	background-color: #f7f9fc;
+}
+
+#fedora-list-packages {
+	border-collapse: collapse;
+	border: 1px solid #cad4e9;
+	border-radius: 2.5px;
+	-moz-border-radius: 2.5px;
+}
+#fedora-list-packages tr.odd td {
+	background-color: #ecf0f7;
+}
+#fedora-list-packages tr.even td {
+	background-color: #f7f9fc;
+}
+#fedora-list-packages th,
+#fedora-list-packages td {
+	margin: 0;
+	padding: 6px 8px;
+}
+#fedora-list-packages td.column-2 {
+	text-align: center;
+}
+#fedora-list-packages th {
+	background-color: #cad4e9;
+	color: #000;
+	font-weight: bold;
+	text-align: center;
+
+}
+
+/* pre.screen is for DocBook HTML output */
+code.screen, pre.screen {
+	font-family: monospace;
+	font-size: 1em;
+	display: block;
+	padding: 10px;
+	border: 1px solid #bbb;
+	background-color: #eee;
+	color: #000;
+	overflow: auto;
+	border-radius: 2.5px;
+	-moz-border-radius: 2.5px;
+	margin: 0.5em 2em;
+}
+#fedora-project code.screen {
+	margin: 0;
+}
+
+code.command, code.filename {
+	font-family: monospace;
+}
+
+code.citetitle {
+	font-family: sans-serif;
+	font-style: italic;
+}
+
+strong.application {
+	font-weight: bold;
+}
+.indent {
+	margin: 0 2em;
+}
+.fedora-docs-nav {
+	text-align: center;
+	position: relative;
+	padding: 1em;
+	margin-top: 2em;
+	border-top: 1px solid #ccc;
+}
+.fedora-docs-nav a {
+	padding: 0 1em;
+}
+.fedora-docs-nav-left {
+	position: absolute;
+	left: 0;
+}
+.fedora-docs-nav-right {
+	position: absolute;
+	right: 0;
+}
+
+.fedoraEntry {
+
+padding-left: 10px;
+padding-right: 10px;
+padding-bottom: 10px;
+padding-top: 10px;
+border-bottom: 1px solid #ccc;
+}
+
+.fedoraStory {
+}
+
+.fedoraFace {
+	margin: 0 0 10px 10px;
+	float: right;
+}
+
+.fedoraTitle {
+	font-size: 1.25em;
+}
diff --git a/roles/planet/files/sub-planets/summer-coding/css/docbook.css b/roles/planet/files/sub-planets/summer-coding/css/docbook.css
new file mode 100644
index 0000000000..3181bce246
--- /dev/null
+++ b/roles/planet/files/sub-planets/summer-coding/css/docbook.css
@@ -0,0 +1,71 @@
+#fedora-content li p {
+	margin: 0.2em;
+}
+
+#fedora-content div.table table {
+	width: 95%;
+	background-color: #DCDCDC; 
+	color: #000000;
+	border-spacing: 0;
+}
+
+#fedora-content div.table table th {
+	border: 1px solid #A9A9A9;	
+	background-color: #A9A9A9;
+	color: #000000;
+}
+
+#fedora-content div.table table td {
+	border: 1px solid #A9A9A9; 
+	background-color: #DCDCDC;
+	color: #000000;
+	padding: 0.5em;
+	margin-bottom: 0.5em;
+	margin-top: 2px; 
+
+}
+
+div.note table, div.tip table, div.important table, div.caution table, div.warning table {
+	width: 95%;
+	border: 2px solid #B0C4DE;
+	background-color: #F0F8FF;
+	color: #000000;
+	/* padding inside table area */
+	padding: 0.5em;
+	margin-bottom: 0.5em;
+	margin-top: 0.5em;
+}
+
+/* "Just the FAQs, ma'm." */
+.qandaset table {
+	border-collapse: collapse;
+}
+.qandaset {
+}
+.qandaset tr.question {
+}
+.qandaset tr.question td {
+	font-weight: bold;
+	padding: 0 0.5em;
+	margin: 0;
+}
+.qandaset tr.answer td {
+	padding: 0 0.5em 1.5em;
+	margin: 0;
+}
+.qandaset tr.question td, .qandaset tr.answer td {
+	vertical-align: top;
+}
+.qandaset strong {
+	text-align: right;
+}
+
+.article .table table {
+	border: 0;
+	margin: 0 auto;
+	border-collapse: collapse;
+}
+.article .table table th {
+	padding: 5px;
+	text-align: center;
+}
diff --git a/roles/planet/files/sub-planets/summer-coding/css/layout.css b/roles/planet/files/sub-planets/summer-coding/css/layout.css
new file mode 100644
index 0000000000..6ceba83ce0
--- /dev/null
+++ b/roles/planet/files/sub-planets/summer-coding/css/layout.css
@@ -0,0 +1,362 @@
+	body {
+	font-size: 0.9em;
+	font-family: bitstream vera sans,sans-serif;
+	margin: 0;
+	padding: 0;
+	/* (The background color is specified elsewhere, so do a global replacement if it ever changes) */
+	background-color: #d9d9d9;
+}
+
+a:link {
+	color: #900;
+}
+a:visited {
+	color: #48468f;
+}
+a:hover {
+	color: #f20;
+}
+a[name] {
+	color: inherit;
+	text-decoration: inherit;
+}
+
+#fedora-header {
+	background-color: #fff;
+	height: 62px;
+}
+#fedora-header img {
+	border: 0;
+	vertical-align: middle;
+}
+#fedora-header-logo {
+	/* position is offset by the header padding amount */
+	position: absolute;
+	left: 26px;
+	top: 13px;
+	z-index: 3;
+}
+#fedora-header-logo img {
+	width: 110px;
+	height: 40;
+}
+#fedora-header-items {
+	/* position is offset by the header padding amount */
+	position: absolute;
+	right: 10px;
+	top: 15px;
+	text-align: right;
+	display: inline;
+}
+#fedora-header-items a {
+	color: #000;
+	text-decoration: none;
+	padding: 7pt;
+	font-size: 0.8em;
+}
+#fedora-header-items a:hover, #fedora-header-search-button:hover {
+	color: #f20;
+	cursor: pointer;
+}
+#fedora-header-items img {
+	margin-right: 1px;
+	width: 36px;
+	height: 36px;
+}
+#fedora-header-search {
+	height: 25px;
+}
+#fedora-header-search-entry {
+	vertical-align: top;
+	margin: 0.65em 4px 0 10px;
+	padding: 2px 4px;
+	background-color: #f5f5f5;
+	border: 1px solid #999;
+	font-size: 0.8em !important;
+}
+#fedora-header-search-entry:focus {
+	background-color: #fff;
+	border: 1px solid #555;
+}
+#fedora-header-search-button {
+	font-size: 0.8em !important;
+	vertical-align: top;
+	margin-top: 0.2em;
+	border: 0;
+	padding: 7px;
+	background: #fff url('../images/header-search.png') no-repeat left;
+	padding-left: 21px;
+}
+#fedora-header-items form {
+	float: right;
+}
+#fedora-header-items input {
+	font-size: 0.85em;
+}
+#fedora-nav {
+	margin: 0;
+	padding: 0;
+	background-color: #22437f;
+	font-size: 0;
+	height: 5px;
+	border-top: 1px solid #000;
+	border-bottom: 1px solid #f5f5f5;
+}
+#fedora-nav ul {
+	margin: 0;
+	padding: 0;
+}
+#fedora-nav li {
+	display: inline;
+	list-style: none;
+	padding: 0 5pt;
+}
+#fedora-nav li + li {
+	padding-left: 8pt;
+	border-left: 1px solid #99a5bf;
+}
+#fedora-nav a {
+	color: #c5ccdb;
+	text-decoration: none;
+}
+#fedora-nav a:hover {
+	color: #fff;
+}
+
+#fedora-side-left {
+	position: absolute;
+	z-index: 2;
+	width: 11em; 
+	/* Space down for the approx line height (fonts) */
+	left: 12px;
+}
+#fedora-side-right {
+	position: absolute;
+	z-index: 1;
+	width: 20em;
+	right: 12px;
+	padding-top: 3px;
+	}
+#fedora-side-left, #fedora-side-right {
+	top: 2px;
+	/* add to the top margin to compensate for the fixed sizes */
+	margin-top: 75px;
+	color: #555;
+	font-size: 0.9em;
+}
+#fedora-side-right ul {
+	list-style: square inside;
+	padding: 0;
+	margin: 0;
+}
+
+/* Left-side naviagation */
+#fedora-side-nav-label {
+	display: none;
+}
+#fedora-side-nav {
+	list-style: none;
+	margin: 0;
+	padding: 0;
+	border: 1px solid #5976b2;
+	border-top: 0;
+	background-color: #22437f;
+}
+#fedora-side-nav li {
+	margin: 0;
+	padding: 0;
+	border-top: 1px solid #5976b2;
+	/* IE/Win gets upset if there is no bottom border... Go figure. */
+	border-bottom: 1px solid #22437f;
+}
+#fedora-side-nav a {
+	margin: 0;
+	color: #c5ccdb;
+	display: block;
+	text-decoration: none;
+	padding: 4px 6px;
+}
+#fedora-side-nav a:hover {
+	background-color: #34548f;
+	color: #fff;
+}
+#fedora-side-nav ul {
+	list-style: none;
+	margin: 0;
+	padding: 0;
+}
+#fedora-side-nav ul li {
+	border-top: 1px solid #34548e;
+	background-color: #34548e;
+	/* IE/Win gets upset if there is no bottom border... Go figure. */
+	border-bottom: 1px solid #34548e;
+}
+#fedora-side-nav ul li:hover {
+	border-bottom: 1px solid #34548f;
+}
+#fedora-side-nav ul li a {
+	padding-left: 12px;
+	color: #a7b2c9;
+}
+#fedora-side-nav ul li a:hover {
+	background-color: #46659e;
+}
+#fedora-side-nav ul ul li a {
+	padding-left: 18px;
+}
+#fedora-side-nav strong a {
+	font-weight: normal;
+	color: #fff !important;
+	background-color: #10203b;
+}
+#fedora-side-nav strong a:hover {
+	background-color: #172e56 !important;
+}
+
+/* content containers */
+#fedora-middle-one, #fedora-middle-two, #fedora-middle-three {
+	font-size: 0.9em;
+	/* position: relative; */ /* relative to utilize z-index */
+	width: auto;
+	min-width: 120px;
+	margin: 10px;
+	z-index: 3; /* content can overlap when the browser is narrow */
+}
+/*
+#fedora-middle-two, #fedora-middle-three {
+	margin-left: 11em;
+	padding-left: 24px;
+}
+*/
+#fedora-middle-three {
+	margin-right: 20em;
+	padding-right: 24px;
+}
+
+#fedora-content {
+	padding: 24px;
+	border: 1px solid #aaa;
+	background-color: #fff;
+}
+
+#fedora-content > .fedora-corner-bottom { top: 0 }
+
+.fedora-corner-tl, .fedora-corner-tr, .fedora-corner-bl, .fedora-corner-br {
+	background-color: #d9d9d9;
+	position: relative;
+	width: 19px;
+	height: 19px;
+	/* The following line is to render PNGs with alpha transparency within IE/Win, using DirectX */
+	/* Work-around for IE6/Mac borkage (Part 1) */
+	display: none;
+}
+
+.fedora-corner-tl, .fedora-corner-bl { float: left; left: 0px; }
+.fedora-corner-tr, .fedora-corner-br { float: right; right: 0px; }
+.fedora-corner-tl, .fedora-corner-tr { top: 0px; }
+.fedora-corner-bl, .fedora-corner-br { bottom: 0px; margin-top: -19px; }
+
+
+html>body .fedora-corner-tl { background: #d9d9d9 url("../images/corner-tl.png") no-repeat left top; }
+html>body .fedora-corner-tr { background: #d9d9d9 url("../images/corner-tr.png") no-repeat right top; }
+html>body .fedora-corner-bl { background: #d9d9d9 url("../images/corner-bl.png") no-repeat left bottom; }
+html>body .fedora-corner-br { background: #d9d9d9 url("../images/corner-br.png") no-repeat right bottom; }
+
+.fedora-corner-tl { filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/corner-tl.png',sizingMethod='scale'); }
+.fedora-corner-tr { filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/corner-tr.png',sizingMethod='scale'); }
+.fedora-corner-br { filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/corner-br.png',sizingMethod='scale'); }
+.fedora-corner-bl { filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/corner-bl.png',sizingMethod='scale'); }
+
+/* \*/
+.fedora-corner-tl, .fedora-corner-tr, .fedora-corner-bl, .fedora-corner-br {
+	/* Restore the view for everything but IE6/Mac (part 2 of the "IE/Mac fix") */
+	display: block;
+}
+/* */
+
+html*.fedora-corner-bl, html*.fedora-corner-br {
+	/* Compensate for Opera's inability to position some things correctly (Part 2) */
+	top: 0px;
+}
+
+.content { margin: 0 1em }
+
+#fedora-sidelist {
+	position: relative;
+	bottom: 3px;
+	margin: 0;
+	padding: 3px !important;
+	border: 1px solid #bbb;
+	background-color: #ccc;
+	border-radius: 2.5px;
+	-moz-border-radius: 2.5px;
+}
+#fedora-sidelist strong a {
+	font-weight: normal;
+	background-color: #555;
+	color: #fff;
+}
+#fedora-sidelist strong a:hover {
+	background-color: #333;
+	color: #fff;
+}
+#fedora-sidelist li {
+	list-style-position: outside;
+	font-size: 0.9em;
+	list-style: none;
+	border: 1px solid #ccc;
+	border-width: 1px 0;
+	padding: 0;
+	list-style: none;
+}
+#fedora-sidelist li a {
+	text-decoration: none;
+	display: block;
+	padding: 6px 8px;
+	border-radius: 2.5px;
+	-moz-border-radius: 2.5px;
+}
+#fedora-sidelist li a:hover {
+	background-color: #999;
+	color: #eee;
+}
+
+#fedora-footer {
+	font-size: 0.75em;
+	text-align: center;
+	color: #777;
+	margin-bottom: 2em;
+}
+#fedora-printable {
+	text-align: center;
+	margin: 1em 0;
+	font-size: 0.85em;
+}
+#fedora-printable a {
+	text-decoration: none;
+	padding: 5px 0;
+	padding-left: 18px;
+	background: transparent url("../images/printable.png") no-repeat left;
+}
+#fedora-printable a:hover {
+	text-decoration: underline;
+}
+
+
+.left {
+	margin: 10px;
+	padding: 0px;
+	float: left;
+}
+
+.right {
+	margin: 10px;
+	padding: 0px;
+	float: right;
+}
+
+
+.blosxomStory p {
+	margin-top: 7px;
+	margin-bottom: 7px;
+}
\ No newline at end of file
diff --git a/roles/planet/files/sub-planets/summer-coding/css/people-style.css b/roles/planet/files/sub-planets/summer-coding/css/people-style.css
new file mode 100644
index 0000000000..9f95fc7535
--- /dev/null
+++ b/roles/planet/files/sub-planets/summer-coding/css/people-style.css
@@ -0,0 +1,169 @@
+html, body {
+	border: 0;
+	padding: 0;
+	margin: 0;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	min-width: 912px;
+	background-color: #eeeff1;
+}
+#header {
+	margin-bottom: 23px; /* sync this value with margin-top of #content */
+	background: #2963a5 url("../images/people-header.png") repeat-y 20% 0%;
+	height: 74px;
+}
+#header .logo {
+	position: absolute;
+	display: block;
+	left: 5px;
+	top: 3px;
+}
+#content {
+	margin-top: -23px;  /* sync this value with margin-top of #content */
+	margin-right: 210px;
+	background-color: white;
+}
+.blog-entries-daily {
+	background: white url("../images/people-entry-group-date-header.png") no-repeat top right;
+	margin-right: 25px;
+	position: relative;
+	padding-bottom: 12px;
+	margin-bottom: 30px;
+}
+.blog-date {
+	text-align: center;
+	background: transparent url("../images/people-entry-group-date-background.png") repeat-y top right;
+	color: white;
+	margin-top: 11px;
+	position: absolute;
+	right: 0;
+	font-size: 0.9em;
+	width: 229px;
+	height: 100%;
+}
+.blog-entry {
+	clear: both;
+	margin: 11px 0;
+	position: relative;
+	top: 40px;
+}
+.blog-entry-author {
+	float: left;
+	margin-top: 30px;
+	padding: 0 20px 30px 0;
+	width: 125px;
+	font-size: 0.8em;
+	text-align: center;
+}
+.blog-entry-author :link, .blog-entry-author :visited {
+	font-size: 0.9em;
+}
+.blog-entry-author .head {
+	display: block;
+	margin: 1ex auto;
+	border: 0;
+}
+.blog-entry-post {
+	margin: 1em 0 1em 145px;
+	border-radius: 20px;
+	background: transparent url("../images/people-entry-center-left.png") repeat-y center left;
+}
+.blog-entry-header {
+	background: transparent url("../images/people-entry-top-center.png") repeat-x top center;
+	height: 50px;
+}
+.blog-entry-title {
+	font-size: larger;
+	background: transparent url("../images/people-entry-top-left.png") no-repeat top left;
+	height: 50px;
+}
+.blog-entry-title a {
+	padding: 1em 0;
+	display: block;
+	margin-left: 25px;
+	background: transparent url("../images/people-entry-top-right.png") no-repeat top right;
+	height: 50px;
+}
+.blog-entry-content {
+	padding-top:10px;
+	padding-right: 3em;
+	margin-left: 25px;
+	text-align: justify;
+	font-size: 0.8em;
+	font-weight: normal;
+	background: transparent url("../images/people-entry-center-right.png") repeat-y center right;
+	padding-bottom:10px;
+	position: relative;
+	overflow: auto;
+}
+.blog-entry-content img {
+	max-width: 575px;
+	margin-left: 2ex;
+}
+.blog-entry-footer {
+	background: transparent url("../images/people-entry-bottom-center.png") repeat-x bottom center;
+}
+.blog-entry-timestamp {
+	font-size: x-small;
+	text-align: right;
+	color: #b3b3b3;
+	background: transparent url("../images/people-entry-bottom-left.png") no-repeat bottom left;
+}
+.blog-entry-timestamp a {
+	display: block;
+	color: #b3b3b3;
+	text-decoration: none;
+	height: 35px;
+	background: transparent url("../images/people-entry-bottom-right.png") no-repeat bottom right;
+	padding: 1em 5em 0 0;
+}
+#disclaimer {
+	font-size: x-small;
+	color: #b3b3b3;
+	text-align: center;
+	padding: 1em;
+}
+#sidebar {
+	color: #555555;
+	background-color: #eeeff1;
+	font-size: 0.8em;
+	position: absolute;
+	width: 210px;
+	min-width: 210px;
+	max-width: 210px;
+	top: 0;
+	right: 0;
+	margin: 0;
+	border-left: 2px solid white;
+	height: 100%;
+}
+#sidebar #sidebar-header {
+	display: block;
+	background-color: #2963a5;
+}
+#sidebar-inner {
+	padding: 10px;
+}
+#sidebar h2 {
+	font-size: 1.4em;
+	font-weight: normal;
+	border-bottom: 1px solid #cfd4d9;
+	margin: 5px 0px;
+	padding: 0px 5px;
+}
+
+#sidebar ul {
+	list-style: square inside;
+	padding: 0;
+	margin: 0 0 1em 0;
+	color: #22538b;
+}
+#spacer {
+	height: 1em;
+}
+:link {
+	color: #337ACC;
+}
+:visited {
+	color: #6A3B18;
+}
+
diff --git a/roles/planet/files/sub-planets/summer-coding/css/print.css b/roles/planet/files/sub-planets/summer-coding/css/print.css
new file mode 100644
index 0000000000..0be9beab70
--- /dev/null
+++ b/roles/planet/files/sub-planets/summer-coding/css/print.css
@@ -0,0 +1,86 @@
+body {
+	background: white;
+	color: black;
+	font-size: 10pt;
+	font-family: sans-serif;
+	line-height: 1.25em;
+}
+
+div {
+	border: 1px solid white;
+}
+li {
+	border: 1px solid white;
+	margin: 0;
+}
+li p {
+	display: inline;
+}
+
+h1 {
+	font-size: 16pt;
+}
+h2 {
+	font-size: 12pt;
+}
+h3,h4,h5 {
+	font-size: 10pt;
+}
+img {
+	border: 1px solid white;
+	background-color: white;
+}
+hr {
+	border: 1px dotted gray;
+	border-width: 0 0 1 0;
+	margin: 1em;
+}
+table {
+	border-collapse: collapse;
+}
+td,th {
+	border: 1px solid gray;
+	padding: 8pt;
+	font-size: 10pt;
+}
+th {
+	font-weight: bold;
+}
+#fedora-header, #fedora-footer {
+	text-align: center;
+}
+#fedora-header-items, #fedora-side-left, #fedora-side-right {
+	display: none;
+}
+
+#fedora-project-download dt {
+	font-weight: bold;
+	margin-top: 8pt;
+	margin-left: 5pt;
+}
+#fedora-project-download dd {
+	padding: 0;
+	margin: 10px 20px 0;
+}
+
+code.screen, pre.screen {
+	font-family: monospace;
+	font-size: 1em;
+	display: block;
+	padding: 5pt;
+	border: 1px dashed gray;
+	margin: 0.5em 2em;
+}
+#fedora-project code.screen {
+	margin: 0;
+}
+
+/*
+#fedora-content a:link:after, #fedora-content a:visited:after {
+	content: " (" attr(href) ") ";
+	font-size: 80%;
+}
+*/
+.navheader table, .navheader table td {
+	border: 0 !important;
+}
diff --git a/roles/planet/files/sub-planets/summer-coding/fpbuilder.conf b/roles/planet/files/sub-planets/summer-coding/fpbuilder.conf
new file mode 100644
index 0000000000..475667421e
--- /dev/null
+++ b/roles/planet/files/sub-planets/summer-coding/fpbuilder.conf
@@ -0,0 +1,5 @@
+[main]
+base_config=/etc/planet/summer-coding/base_config
+output=/srv/planet/site/summer-coding/planet.ini
+group=summer-coding
+
diff --git a/roles/planet/files/sub-planets/summer-coding/images/blue.png b/roles/planet/files/sub-planets/summer-coding/images/blue.png
new file mode 100644
index 0000000000..6987cab624
Binary files /dev/null and b/roles/planet/files/sub-planets/summer-coding/images/blue.png differ
diff --git a/roles/planet/files/sub-planets/summer-coding/images/corner-bl.png b/roles/planet/files/sub-planets/summer-coding/images/corner-bl.png
new file mode 100644
index 0000000000..58d269c306
Binary files /dev/null and b/roles/planet/files/sub-planets/summer-coding/images/corner-bl.png differ
diff --git a/roles/planet/files/sub-planets/summer-coding/images/corner-br.png b/roles/planet/files/sub-planets/summer-coding/images/corner-br.png
new file mode 100644
index 0000000000..c03dd92bec
Binary files /dev/null and b/roles/planet/files/sub-planets/summer-coding/images/corner-br.png differ
diff --git a/roles/planet/files/sub-planets/summer-coding/images/corner-tl.png b/roles/planet/files/sub-planets/summer-coding/images/corner-tl.png
new file mode 100644
index 0000000000..08ab7a3ac2
Binary files /dev/null and b/roles/planet/files/sub-planets/summer-coding/images/corner-tl.png differ
diff --git a/roles/planet/files/sub-planets/summer-coding/images/corner-tr.png b/roles/planet/files/sub-planets/summer-coding/images/corner-tr.png
new file mode 100644
index 0000000000..b279db2961
Binary files /dev/null and b/roles/planet/files/sub-planets/summer-coding/images/corner-tr.png differ
diff --git a/roles/planet/files/sub-planets/summer-coding/images/favicon.ico b/roles/planet/files/sub-planets/summer-coding/images/favicon.ico
new file mode 100644
index 0000000000..d1ae2d209a
Binary files /dev/null and b/roles/planet/files/sub-planets/summer-coding/images/favicon.ico differ
diff --git a/roles/planet/files/sub-planets/summer-coding/images/header-download.png b/roles/planet/files/sub-planets/summer-coding/images/header-download.png
new file mode 100644
index 0000000000..a1cf3e577e
Binary files /dev/null and b/roles/planet/files/sub-planets/summer-coding/images/header-download.png differ
diff --git a/roles/planet/files/sub-planets/summer-coding/images/header-faq.png b/roles/planet/files/sub-planets/summer-coding/images/header-faq.png
new file mode 100644
index 0000000000..1e7c3c95d3
Binary files /dev/null and b/roles/planet/files/sub-planets/summer-coding/images/header-faq.png differ
diff --git a/roles/planet/files/sub-planets/summer-coding/images/header-fedora_logo.png b/roles/planet/files/sub-planets/summer-coding/images/header-fedora_logo.png
new file mode 100644
index 0000000000..552f201643
Binary files /dev/null and b/roles/planet/files/sub-planets/summer-coding/images/header-fedora_logo.png differ
diff --git a/roles/planet/files/sub-planets/summer-coding/images/header-projects.png b/roles/planet/files/sub-planets/summer-coding/images/header-projects.png
new file mode 100644
index 0000000000..aad307edd2
Binary files /dev/null and b/roles/planet/files/sub-planets/summer-coding/images/header-projects.png differ
diff --git a/roles/planet/files/sub-planets/summer-coding/images/heads/default.png b/roles/planet/files/sub-planets/summer-coding/images/heads/default.png
new file mode 100644
index 0000000000..407185b503
Binary files /dev/null and b/roles/planet/files/sub-planets/summer-coding/images/heads/default.png differ
diff --git a/roles/planet/files/sub-planets/summer-coding/images/intro-computer.png b/roles/planet/files/sub-planets/summer-coding/images/intro-computer.png
new file mode 100644
index 0000000000..9298aecea3
Binary files /dev/null and b/roles/planet/files/sub-planets/summer-coding/images/intro-computer.png differ
diff --git a/roles/planet/files/sub-planets/summer-coding/images/intro-download.png b/roles/planet/files/sub-planets/summer-coding/images/intro-download.png
new file mode 100644
index 0000000000..c77db0be2d
Binary files /dev/null and b/roles/planet/files/sub-planets/summer-coding/images/intro-download.png differ
diff --git a/roles/planet/files/sub-planets/summer-coding/images/logo-spacer.png b/roles/planet/files/sub-planets/summer-coding/images/logo-spacer.png
new file mode 100644
index 0000000000..a104f5535f
Binary files /dev/null and b/roles/planet/files/sub-planets/summer-coding/images/logo-spacer.png differ
diff --git a/roles/planet/files/sub-planets/summer-coding/images/logo.png b/roles/planet/files/sub-planets/summer-coding/images/logo.png
new file mode 100644
index 0000000000..f277bf9281
Binary files /dev/null and b/roles/planet/files/sub-planets/summer-coding/images/logo.png differ
diff --git a/roles/planet/files/sub-planets/summer-coding/images/mainBack.png b/roles/planet/files/sub-planets/summer-coding/images/mainBack.png
new file mode 100644
index 0000000000..1372780be6
Binary files /dev/null and b/roles/planet/files/sub-planets/summer-coding/images/mainBack.png differ
diff --git a/roles/planet/files/sub-planets/summer-coding/images/people-entry-bottom-center.png b/roles/planet/files/sub-planets/summer-coding/images/people-entry-bottom-center.png
new file mode 100644
index 0000000000..8d8ee6ace4
Binary files /dev/null and b/roles/planet/files/sub-planets/summer-coding/images/people-entry-bottom-center.png differ
diff --git a/roles/planet/files/sub-planets/summer-coding/images/people-entry-bottom-left.png b/roles/planet/files/sub-planets/summer-coding/images/people-entry-bottom-left.png
new file mode 100644
index 0000000000..1aadc48c53
Binary files /dev/null and b/roles/planet/files/sub-planets/summer-coding/images/people-entry-bottom-left.png differ
diff --git a/roles/planet/files/sub-planets/summer-coding/images/people-entry-bottom-right.png b/roles/planet/files/sub-planets/summer-coding/images/people-entry-bottom-right.png
new file mode 100644
index 0000000000..047c9081f9
Binary files /dev/null and b/roles/planet/files/sub-planets/summer-coding/images/people-entry-bottom-right.png differ
diff --git a/roles/planet/files/sub-planets/summer-coding/images/people-entry-center-left.png b/roles/planet/files/sub-planets/summer-coding/images/people-entry-center-left.png
new file mode 100644
index 0000000000..9da8d17866
Binary files /dev/null and b/roles/planet/files/sub-planets/summer-coding/images/people-entry-center-left.png differ
diff --git a/roles/planet/files/sub-planets/summer-coding/images/people-entry-center-right.png b/roles/planet/files/sub-planets/summer-coding/images/people-entry-center-right.png
new file mode 100644
index 0000000000..379c8c0671
Binary files /dev/null and b/roles/planet/files/sub-planets/summer-coding/images/people-entry-center-right.png differ
diff --git a/roles/planet/files/sub-planets/summer-coding/images/people-entry-group-date-background.png b/roles/planet/files/sub-planets/summer-coding/images/people-entry-group-date-background.png
new file mode 100644
index 0000000000..f029a675a4
Binary files /dev/null and b/roles/planet/files/sub-planets/summer-coding/images/people-entry-group-date-background.png differ
diff --git a/roles/planet/files/sub-planets/summer-coding/images/people-entry-group-date-header.png b/roles/planet/files/sub-planets/summer-coding/images/people-entry-group-date-header.png
new file mode 100644
index 0000000000..47ee607a41
Binary files /dev/null and b/roles/planet/files/sub-planets/summer-coding/images/people-entry-group-date-header.png differ
diff --git a/roles/planet/files/sub-planets/summer-coding/images/people-entry-top-center.png b/roles/planet/files/sub-planets/summer-coding/images/people-entry-top-center.png
new file mode 100644
index 0000000000..6b3b33aebf
Binary files /dev/null and b/roles/planet/files/sub-planets/summer-coding/images/people-entry-top-center.png differ
diff --git a/roles/planet/files/sub-planets/summer-coding/images/people-entry-top-left.png b/roles/planet/files/sub-planets/summer-coding/images/people-entry-top-left.png
new file mode 100644
index 0000000000..007a1e2850
Binary files /dev/null and b/roles/planet/files/sub-planets/summer-coding/images/people-entry-top-left.png differ
diff --git a/roles/planet/files/sub-planets/summer-coding/images/people-entry-top-right.png b/roles/planet/files/sub-planets/summer-coding/images/people-entry-top-right.png
new file mode 100644
index 0000000000..bfb41fb2a2
Binary files /dev/null and b/roles/planet/files/sub-planets/summer-coding/images/people-entry-top-right.png differ
diff --git a/roles/planet/files/sub-planets/summer-coding/images/people-header.png b/roles/planet/files/sub-planets/summer-coding/images/people-header.png
new file mode 100644
index 0000000000..d1fcbbc3c1
Binary files /dev/null and b/roles/planet/files/sub-planets/summer-coding/images/people-header.png differ
diff --git a/roles/planet/files/sub-planets/summer-coding/images/people-logo.png b/roles/planet/files/sub-planets/summer-coding/images/people-logo.png
new file mode 100644
index 0000000000..6404e088f1
Binary files /dev/null and b/roles/planet/files/sub-planets/summer-coding/images/people-logo.png differ
diff --git a/roles/planet/files/sub-planets/summer-coding/images/people-sidebar-header.png b/roles/planet/files/sub-planets/summer-coding/images/people-sidebar-header.png
new file mode 100644
index 0000000000..c82025672e
Binary files /dev/null and b/roles/planet/files/sub-planets/summer-coding/images/people-sidebar-header.png differ
diff --git a/roles/planet/files/sub-planets/summer-coding/images/planet.png b/roles/planet/files/sub-planets/summer-coding/images/planet.png
new file mode 100644
index 0000000000..9606a0c30d
Binary files /dev/null and b/roles/planet/files/sub-planets/summer-coding/images/planet.png differ
diff --git a/roles/planet/files/sub-planets/summer-coding/planet-group.cron b/roles/planet/files/sub-planets/summer-coding/planet-group.cron
new file mode 100644
index 0000000000..1568a06874
--- /dev/null
+++ b/roles/planet/files/sub-planets/summer-coding/planet-group.cron
@@ -0,0 +1,2 @@
+*/20 * * * * planet-user bash /usr/local/bin/pull-run-planet-config.sh /etc/planet/summer-coding/fpbuilder.conf >>/dev/null 2>&1
+10 4 * * * *  planet-user /usr/sbin/tmpwatch 360 /srv/planet/config/summer-coding/cache >>/dev/null
\ No newline at end of file
diff --git a/roles/planet/files/sub-planets/summer-coding/templates/atom.xml.tmpl b/roles/planet/files/sub-planets/summer-coding/templates/atom.xml.tmpl
new file mode 100644
index 0000000000..fac59be451
--- /dev/null
+++ b/roles/planet/files/sub-planets/summer-coding/templates/atom.xml.tmpl
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+
+	<title><TMPL_VAR name></title>
+	<link rel="self" href="<TMPL_VAR feed ESCAPE="HTML">"/>
+	<link href="<TMPL_VAR link ESCAPE="HTML">"/>
+	<id><TMPL_VAR feed ESCAPE="HTML"></id>
+	<updated><TMPL_VAR date_iso></updated>
+	<generator uri="http://planet.fedoraproject.org/summer-coding/"><TMPL_VAR generator ESCAPE="HTML"></generator>
+
+<TMPL_LOOP Items>
+	<entry<TMPL_IF channel_language> xml:lang="<TMPL_VAR channel_language>"</TMPL_IF>>
+		<title type="html"<TMPL_IF title_language> xml:lang="<TMPL_VAR title_language>"</TMPL_IF>><TMPL_VAR title ESCAPE="HTML"></title>
+		<link href="<TMPL_VAR link ESCAPE="HTML">"/>
+		<id><TMPL_VAR id ESCAPE="HTML"></id>
+		<updated><TMPL_VAR date_iso></updated>
+		<content type="html"<TMPL_IF content_language> xml:lang="<TMPL_VAR content_language>"</TMPL_IF>>
+                <TMPL_IF channel_face>
+			&lt;img src=&quot;<TMPL_VAR channel_face ESCAPE="HTML">&quot; <TMPL_IF channel_facewidth>width=&quot;<TMPL_VAR channel_facewidth>&quot; </TMPL_IF><TMPL_IF channel_faceheight>height=&quot;<TMPL_VAR channel_faceheight>&quot; </TMPL_IF> alt=&quot;&quot; style=&quot;float: right;&quot;&gt;
+		</TMPL_IF> <TMPL_VAR content ESCAPE="HTML"></content>
+		<author>
+<TMPL_IF author_name>
+			<name><TMPL_VAR author_name ESCAPE="HTML"></name>
+<TMPL_IF author_email>
+			<email><TMPL_VAR author_email ESCAPE="HTML"></email>
+</TMPL_IF author_email>
+<TMPL_ELSE>
+<TMPL_IF channel_author_name>
+			<name><TMPL_VAR channel_author_name ESCAPE="HTML"></name>
+<TMPL_IF channel_author_email>
+			<email><TMPL_VAR channel_author_email ESCAPE="HTML"></email>
+</TMPL_IF channel_author_email>
+<TMPL_ELSE>
+			<name><TMPL_VAR channel_name ESCAPE="HTML"></name>
+</TMPL_IF>
+</TMPL_IF>
+			<uri><TMPL_VAR channel_link ESCAPE="HTML"></uri>
+		</author>
+		<source>
+<TMPL_IF channel_title>
+			<title type="html"><TMPL_VAR channel_title ESCAPE="HTML"></title>
+<TMPL_ELSE>
+			<title type="html"><TMPL_VAR channel_name ESCAPE="HTML"></title>
+</TMPL_IF>
+<TMPL_IF channel_subtitle>
+			<subtitle type="html"><TMPL_VAR channel_subtitle ESCAPE="HTML"></subtitle>
+</TMPL_IF>
+			<link rel="self" href="<TMPL_VAR channel_url ESCAPE="HTML">"/>
+<TMPL_IF channel_id>
+			<id><TMPL_VAR channel_id ESCAPE="HTML"></id>
+<TMPL_ELSE>
+			<id><TMPL_VAR channel_url ESCAPE="HTML"></id>
+</TMPL_IF>
+<TMPL_IF channel_updated_iso>
+			<updated><TMPL_VAR channel_updated_iso></updated>
+</TMPL_IF>
+<TMPL_IF channel_rights>
+			<rights type="html"><TMPL_VAR channel_rights ESCAPE="HTML"></rights>
+</TMPL_IF>
+		</source>
+	</entry>
+
+</TMPL_LOOP>
+</feed>
diff --git a/roles/planet/files/sub-planets/summer-coding/templates/foafroll.xml.tmpl b/roles/planet/files/sub-planets/summer-coding/templates/foafroll.xml.tmpl
new file mode 100644
index 0000000000..b2cecf3548
--- /dev/null
+++ b/roles/planet/files/sub-planets/summer-coding/templates/foafroll.xml.tmpl
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<rdf:RDF
+	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+	xmlns:foaf="http://xmlns.com/foaf/0.1/"
+	xmlns:rss="http://purl.org/rss/1.0/"
+	xmlns:dc="http://purl.org/dc/elements/1.1/"
+>
+<foaf:Group>
+	<foaf:name><TMPL_VAR name></foaf:name>
+	<foaf:homepage><TMPL_VAR link></foaf:homepage>
+	<rdfs:seeAlso rdf:resource="<TMPL_VAR uri ESCAPE="HTML">" />
+
+<TMPL_LOOP Channels>
+	<foaf:member>
+		<foaf:Agent>
+			<foaf:name><TMPL_VAR name></foaf:name>
+			<foaf:weblog>
+				<foaf:Document rdf:about="<TMPL_VAR link ESCAPE="HTML">">
+					<dc:title><TMPL_VAR title></dc:title>
+					<rdfs:seeAlso>
+						<rss:channel rdf:about="<TMPL_VAR uri ESCAPE="HTML">" />
+					</rdfs:seeAlso>
+				</foaf:Document>
+			</foaf:weblog>
+		</foaf:Agent>
+	</foaf:member>
+</TMPL_LOOP>
+
+</foaf:Group>
+</rdf:RDF>
diff --git a/roles/planet/files/sub-planets/summer-coding/templates/heads.html.tmpl b/roles/planet/files/sub-planets/summer-coding/templates/heads.html.tmpl
new file mode 100644
index 0000000000..67ec0ce7e8
--- /dev/null
+++ b/roles/planet/files/sub-planets/summer-coding/templates/heads.html.tmpl
@@ -0,0 +1,97 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<title>Planet Fedora summer-coding</title>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8">
+    <meta http-equiv="Content-Type" content="text/html">
+    <meta name="MSSmartTagsPreventParsing" content="TRUE">
+    <link rel="stylesheet" type="text/css" media="print" href="http://planet.fedoraproject.org/css/print.css">
+    <link rel="stylesheet" type="text/css" media="all" href="http://fedoraproject.org/static/css/fedora.css">
+    <link rel="stylesheet" type="text/css" media="all" href="/css/fedora_planet.css">
+    <link rel="shortcut icon" href="/images/favicon.ico">
+    <link rel="icon" href="/images/favicon.ico">
+    <style type="text/css">
+        #content ul {
+            overflow: auto;
+            list-style: none;
+        }
+        #content ul li {
+            height: 160px;
+            float: left;
+            text-align: center;
+            margin: 1em;
+        }
+        #content ul li img {
+            display: block;
+            margin: 0 auto;
+        }
+    </style>
+</head>
+<body class="home">
+    <div id="wrapper">
+
+        <div id="head">
+            <h1><a href="http://fedoraproject.org/">Fedora</a></h1>
+        </div>
+
+        <div id="sidebar">
+            <div id="planet_nav">
+
+                <h2>Feeds</h2>
+                <a href="rss10.xml">RSS 1.0</a><br>
+                <a href="rss20.xml">RSS 2.0</a><br>
+                <a href="atom.xml">Atom 1.0</a><br>
+                <a href="foafroll.xml">FOAF blogroll</a><br>
+
+                <h2>Links</h2>
+                <ul>
+                    <li><a href="http://fedoraproject.org">Fedora Home</a></li>
+                    <li><a href="http://fedoranews.org">Fedora News</a></li>
+                    <li><a href="http://planet.fedoraproject.org/heads/">Hackergotchi Heads</a></li>
+                    <li><a href="http://fedoraproject.org/infofeed/">Fedora Info</a></li>
+                </ul>
+
+                <h2>People</h2>
+                <ul id="people_feeds">
+
+                <TMPL_LOOP Channels>
+                    <li><a href="<TMPL_VAR url ESCAPE="HTML">"><img src="/images/rss.png" alt="RSS"></a><a href="<TMPL_VAR link>" title="<TMPL_VAR title>"><TMPL_VAR name></a></li>
+                </TMPL_LOOP>
+                </ul>
+
+                <h2>Add your blog</h2>
+                <ul><li><a href="http://fedoraproject.org/wiki/Planet_HowTo">Add your blog</a></li></ul>
+		<ul><li><div class="fedora_planet">"The content on this page is provided by Fedora contributors, and represents their individual viewpoints, and not necessarily those of the Fedora Project or any of its sponsors or other members."</div></a></li></ul>
+            </div>
+        </div>
+
+
+        <div id="content">
+            <div class="spacer">
+            </div> <!-- :-} -->
+<ul>
+<TMPL_LOOP Channels>
+<!--<li class="head"><TMPL_IF link><a href="<TMPL_VAR link>" title="<TMPL_VAR title>"></TMPL_IF><img src="<TMPL_VAR face ESCAPE="HTML">" <TMPL_IF facewidth>width="<TMPL_VAR facewidth>" </TMPL_IF><TMPL_IF faceheight>height="<TMPL_VAR faceheight>" </TMPL_IF>alt="" /><TMPL_VAR name><TMPL_IF link></a></TMPL_IF></li>-->
+<li class="head"><TMPL_IF link><a href="<TMPL_VAR link ESCAPE="HTML">" title="<TMPL_VAR title>"></TMPL_IF><img src="<TMPL_VAR face ESCAPE="HTML">" /><TMPL_VAR name><TMPL_IF link></a></TMPL_IF></li>
+</TMPL_LOOP>
+</ul>
+
+    </div>
+</div>
+    <div id="bottom">
+        <div id="footer">
+            <p class="copy">&copy; 2010 Red Hat, Inc. and others.  Please send any comments or corrections to the <a href="mailto:webmaster@fedoraproject.org">websites team</a>.</p>
+            <p class="disclaimer">The Fedora Project is maintained and driven by the community and sponsored by Red Hat.  This is a community maintained site.  Red Hat is not responsible for content.</p>
+            <p class="disclaimer">Your words are your own, duh. Nothing here represents Fedora™, Red Hat, Inc, or pretty much anything else. If you think it does then you are badly misled</p>
+            <ul>
+                <li class="first"><a href="/en/sponsors">Sponsors</a></li>
+                <li><a href="http://fedoraproject.org/wiki/Legal">Legal</a></li>
+                <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a></li>
+            </ul>
+        </div>
+    </div>
+
+
+</body>
+</html>
diff --git a/roles/planet/files/sub-planets/summer-coding/templates/index.html.tmpl b/roles/planet/files/sub-planets/summer-coding/templates/index.html.tmpl
new file mode 100644
index 0000000000..940118e065
--- /dev/null
+++ b/roles/planet/files/sub-planets/summer-coding/templates/index.html.tmpl
@@ -0,0 +1,112 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<title>Planet Fedora summer-coding</title>
+    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+    <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8">
+    <meta http-equiv="Content-Type" content="text/html">
+    <meta name="MSSmartTagsPreventParsing" content="TRUE">
+    <link rel="stylesheet" type="text/css" media="print" href="http://planet.fedoraproject.org/css/print.css">
+    <link rel="stylesheet" type="text/css" media="all" href="http://fedoraproject.org/static/css/fedora.css">
+    <link rel="stylesheet" type="text/css" media="all" href="/css/fedora_planet.css">
+    <link rel="shortcut icon" href="/images/favicon.ico">
+    <link rel="icon" href="/images/favicon.ico">
+    <link rel="alternate" type="application/xml" title="RSS" href="http://planet.fedoraproject.org/summer-coding/rss20.xml">
+    <link rel="alternate" type="application/atom+xml" title="Fedora People Atom 1.0" href="http://planet.fedoraproject.org/summer-coding/atom.xml">
+</head>
+<body class="home">
+    <div id="wrapper">
+
+        <div id="head">
+            <h1><a href="http://fedoraproject.org/">Fedora</a></h1>
+        </div>
+
+        <div id="sidebar">
+            <div id="planet_nav">
+
+                <h2>Feeds</h2>
+                <a href="rss10.xml">RSS 1.0</a><br>
+                <a href="rss20.xml">RSS 2.0</a><br>
+                <a href="atom.xml">Atom 1.0</a><br>
+                <a href="foafroll.xml">FOAF blogroll</a><br>
+
+                <h2>Links</h2>
+                <ul>
+                    <li><a href="http://fedoraproject.org">Fedora Home</a></li>
+                    <li><a href="http://fedoranews.org">Fedora News</a></li>
+                    <li><a href="http://fedoraproject.org/infofeed/">Fedora Info</a></li>
+                </ul>
+
+                <h2>People</h2>
+                <ul id="people_feeds">
+
+                <TMPL_LOOP Channels>
+                    <li><a href="<TMPL_VAR url ESCAPE="HTML">"><img src="images/rss.png" alt="RSS"></a><a href="<TMPL_VAR link ESCAPE="HTML">" title="<TMPL_VAR title ESCAPE="HTML">"><TMPL_VAR name ESCAPE="HTML"></a></li>
+                </TMPL_LOOP>
+                </ul>
+
+                <h2>Add your blog</h2>
+                <ul><li><a href="http://fedoraproject.org/wiki/Planet_HowTo">Add your blog</a></li></ul>
+		<ul><li><div class="fedora_planet">"The content on this page is provided by Fedora contributors, and represents their individual viewpoints, and not necessarily those of the Fedora Project or any of its sponsors or other members."</div></a></li></ul>
+            </div>
+        </div>
+
+
+        <div id="content">
+            <div class="spacer">
+        <TMPL_LOOP Items>
+
+            <TMPL_IF new_date>
+            </div> <!-- :-} -->
+
+            <div class="blog-entries-daily">
+            <h2 class="blog-date"><TMPL_VAR new_date></h2>
+            </TMPL_IF>
+
+
+            <div class="blog-entry <TMPL_VAR channel_name>">
+                <div class="blog-entry-post">
+                    <div class="blog-entry-header">
+                        <div class="blog-entry-author">
+
+                            <TMPL_IF channel_face>
+                                <img src="<TMPL_VAR channel_face ESCAPE="HTML">" <TMPL_IF channel_facewidth>width="<TMPL_VAR channel_facewidth>" </TMPL_IF><TMPL_IF channel_faceheight>height="<TMPL_VAR channel_faceheight>" </TMPL_IF>alt="">
+                                <br><a href="<TMPL_VAR channel_link ESCAPE="HTML">"><TMPL_VAR channel_name></a>
+
+                            </TMPL_IF>
+
+                        </div>
+
+                        <div class="blog-entry-title"><a href="<TMPL_VAR link>"><TMPL_IF title><TMPL_VAR title><TMPL_ELSE>Untitled Post</TMPL_IF></a></div>
+                    </div>
+
+                    <div class="blog-entry-content-container">
+
+                        <div class="blog-entry-content"><TMPL_VAR content></div>
+
+                    </div>
+                    <div class="blog-entry-footer">
+                    <div class="blog-entry-timestamp"><a href="<TMPL_VAR link ESCAPE="HTML">"><TMPL_IF creator>by <TMPL_VAR creator> at </TMPL_IF><TMPL_VAR date></a></div>
+                    </div>
+                </div>
+            </div>
+    </TMPL_LOOP>
+        </div>
+    </div>
+</div>
+    <div id="bottom">
+        <div id="footer">
+            <p class="copy">&copy; 2010 Red Hat, Inc. and others.  Please send any comments or corrections to the <a href="mailto:webmaster@fedoraproject.org">websites team</a>.</p>
+            <p class="disclaimer">The Fedora Project is maintained and driven by the community and sponsored by Red Hat.  This is a community maintained site.  Red Hat is not responsible for content.</p>
+            <p class="disclaimer">Your words are your own, duh. Nothing here represents Fedora™, Red Hat, Inc, or pretty much anything else. If you think it does then you are badly misled</p>
+            <ul>
+                <li class="first"><a href="/en/sponsors">Sponsors</a></li>
+                <li><a href="http://fedoraproject.org/wiki/Legal">Legal</a></li>
+                <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a></li>
+            </ul>
+        </div>
+    </div>
+
+
+</body>
+</html>
diff --git a/roles/planet/files/sub-planets/summer-coding/templates/opml.xml.tmpl b/roles/planet/files/sub-planets/summer-coding/templates/opml.xml.tmpl
new file mode 100644
index 0000000000..aaa8833810
--- /dev/null
+++ b/roles/planet/files/sub-planets/summer-coding/templates/opml.xml.tmpl
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<opml version="1.1">
+	<head>
+		<title><TMPL_VAR name></title>
+		<dateCreated><TMPL_VAR date_822></dateCreated>
+		<dateModified><TMPL_VAR date_822></dateModified>
+		<ownerName><TMPL_VAR owner_name></ownerName>
+		<ownerEmail><TMPL_VAR owner_email></ownerEmail>
+	</head>
+	
+	<body>
+		<TMPL_LOOP Channels>
+		<outline text="<TMPL_VAR name ESCAPE="HTML">" xmlUrl="<TMPL_VAR url ESCAPE="HTML">"/>
+		</TMPL_LOOP>
+	</body>
+</opml>
diff --git a/roles/planet/files/sub-planets/summer-coding/templates/rss10.xml.tmpl b/roles/planet/files/sub-planets/summer-coding/templates/rss10.xml.tmpl
new file mode 100644
index 0000000000..b1cc9d55d1
--- /dev/null
+++ b/roles/planet/files/sub-planets/summer-coding/templates/rss10.xml.tmpl
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<rdf:RDF
+	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	xmlns:dc="http://purl.org/dc/elements/1.1/"
+	xmlns:foaf="http://xmlns.com/foaf/0.1/"
+	xmlns:content="http://purl.org/rss/1.0/modules/content/"
+	xmlns="http://purl.org/rss/1.0/"
+>
+<channel rdf:about="<TMPL_VAR link ESCAPE="HTML">">
+	<title><TMPL_VAR name></title>
+    <link><TMPL_VAR link ESCAPE="HTML"></link>
+        <description>Fedora People: http://planet.fedoraproject.org/summer-coding</description>
+	<items>
+		<rdf:Seq>
+<TMPL_LOOP Items>
+			<rdf:li rdf:resource="<TMPL_VAR id ESCAPE="HTML">" />
+</TMPL_LOOP>
+		</rdf:Seq>
+	</items>
+</channel>
+
+<TMPL_LOOP Items>
+<item rdf:about="<TMPL_VAR id ESCAPE="HTML">">
+	<title><TMPL_VAR channel_name><TMPL_IF title>: <TMPL_VAR title></TMPL_IF></title>
+    <link><TMPL_VAR link ESCAPE="HTML"></link>
+	<TMPL_IF content>
+	<content:encoded><TMPL_VAR content ESCAPE="HTML"></content:encoded>
+	</TMPL_IF>
+	<dc:date><TMPL_VAR date_iso></dc:date>
+</item>
+</TMPL_LOOP>
+
+</rdf:RDF>
diff --git a/roles/planet/files/sub-planets/summer-coding/templates/rss20.xml.tmpl b/roles/planet/files/sub-planets/summer-coding/templates/rss20.xml.tmpl
new file mode 100644
index 0000000000..c9a6afa564
--- /dev/null
+++ b/roles/planet/files/sub-planets/summer-coding/templates/rss20.xml.tmpl
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
+<channel>
+   <atom:link href="http://planet.fedoraproject.org/summer-coding/rss20.xml" rel="self" type="application/rss+xml" />
+	<title><TMPL_VAR name></title>
+	<link><TMPL_VAR link></link>
+	<language>en</language>
+        <description>Fedora People: http://planet.fedoraproject.org/summer-coding</description>
+
+<TMPL_LOOP Items>
+<item>
+	<title><TMPL_VAR channel_name><TMPL_IF title>: <TMPL_VAR title></TMPL_IF></title>
+	<guid isPermaLink="false"><TMPL_VAR id ESCAPE="HTML"></guid>
+	<link><TMPL_VAR link ESCAPE="HTML"></link>
+	<TMPL_IF content>
+
+	<description>
+		<TMPL_IF channel_face>
+			&lt;img src=&quot;<TMPL_VAR channel_face ESCAPE="HTML">&quot; <TMPL_IF channel_facewidth>width=&quot;<TMPL_VAR channel_facewidth>&quot; </TMPL_IF><TMPL_IF channel_faceheight>height=&quot;<TMPL_VAR channel_faceheight>&quot; </TMPL_IF> alt=&quot;&quot; style=&quot;float: right;&quot;&gt;
+		</TMPL_IF>
+		<TMPL_VAR content ESCAPE="HTML"></description>
+	</TMPL_IF>
+	<pubDate><TMPL_VAR date_822></pubDate>
+</item>
+</TMPL_LOOP>
+
+</channel>
+</rss>
diff --git a/roles/planet/tasks/main.yml b/roles/planet/tasks/main.yml
new file mode 100644
index 0000000000..0419939b3b
--- /dev/null
+++ b/roles/planet/tasks/main.yml
@@ -0,0 +1,46 @@
+---
+# tasks to setup a planet server
+#
+
+- name: add planet group
+  group: name=planet-user gid=104 system=yes state=present
+  tags:
+    - planet_server
+
+- name: add planet user
+  user: name=planet-user uid=104 gid=104 home=/srv/planet comment="People Planet Eater" createhome=yes system=yes shell=/bin/bash
+  tags:
+    - planet_server
+    
+- name: add apache to planet group
+  user: name=apache append=yes groups=planet-user
+  tags:
+    - planet_server
+    
+
+- name: install the planet packages
+  yum:  pkg={{item}} state=present
+  with_items:
+    - venus
+  tags:
+    - planet_server
+
+- name: copy the planet cron job
+  copy: src=planet-cron dest=/etc/cron.d/planet-cron
+  tags:
+    - planet_server
+
+- name: copy the planet http config file
+  copy: src=planet-httpd.conf dest=/etc/httpd/conf.d/planet.conf
+  tags:
+    - planet_server
+
+- name: copy the run planet-config script
+  copy: src=pull-run-planet-config.sh dest=/usr/local/bin/pull-run-planet-config.sh
+  tags:
+    - planet_server
+
+- name: copy the run-planet script
+  copy: src=run-planet.sh dest=srv/planet/config/run-planet
+  tags:
+    - planet_server