diff --git a/config.sample.py b/config.sample.py
index 324a9a8b..de29f27f 100644
--- a/config.sample.py
+++ b/config.sample.py
@@ -4,3 +4,11 @@
 
 aapt_path = "/path/to/android-sdk-linux_86/platforms/android-4/tools/aapt"
 
+repo_url = "http://f-droid.org/repo"
+repo_name = "FDroid"
+repo_icon = "fdroid-icon.png"
+repo_description = """
+The official FDroid repository. Applications in this repository are official
+binaries built by the original application developers.
+"""
+
diff --git a/update.py b/update.py
index 15dc548d..8c01e9f8 100644
--- a/update.py
+++ b/update.py
@@ -28,6 +28,10 @@ from xml.dom.minidom import Document
 from optparse import OptionParser
 
 #Read configuration...
+repo_name = None
+repo_description = None
+repo_icon = None
+repo_url = None
 execfile('config.py')
 
 execfile('metadata.py')
@@ -48,6 +52,13 @@ if os.path.exists(icon_dir):
     shutil.rmtree(icon_dir)
 os.mkdir(icon_dir)
 
+#Make sure we have the repository description...
+if (repo_url is None or repo_name is None or
+        repo_icon is None or repo_description is None):
+    print "Repository description fields are required in config.py"
+    print "See config.sample.py for details"
+    sys.exit(1)
+
 # Gather information about all the apk files in the repo directory...
 apks = []
 for apkfile in glob.glob(os.path.join('repo','*.apk')):
@@ -187,6 +198,13 @@ def addElement(name, value, doc, parent):
 root = doc.createElement("fdroid")
 doc.appendChild(root)
 
+repoel = doc.createElement("repo")
+repoel.setAttribute("name", repo_name)
+repoel.setAttribute("icon", repo_icon)
+repoel.setAttribute("url", repo_url)
+addElement('description', repo_description, doc, repoel)
+root.appendChild(repoel)
+
 apps_inrepo = 0
 apps_disabled = 0
 
@@ -261,6 +279,10 @@ output = doc.toxml()
 of.write(output)
 of.close()
 
+#Copy the repo icon into the repo directory...
+iconfilename = os.path.join(icon_dir, repo_icon)
+shutil.copyfile(repo_icon, iconfilename)
+
 print "Finished."
 print str(apps_inrepo) + " apps in repo"
 print str(apps_disabled) + " disabled"