diff --git a/data/StevenBlack/update.info b/data/StevenBlack/update.info
new file mode 100644
index 000000000..c7a37e11d
--- /dev/null
+++ b/data/StevenBlack/update.info
@@ -0,0 +1 @@
+https://raw.github.com/StevenBlack/hosts/master/data/StevenBlack/hosts
diff --git a/data/mvps.org/update.info b/data/mvps.org/update.info
new file mode 100644
index 000000000..8e9f6a106
--- /dev/null
+++ b/data/mvps.org/update.info
@@ -0,0 +1 @@
+http://winhelp2002.mvps.org/hosts.txt
diff --git a/data/someonewhocares.org/update.info b/data/someonewhocares.org/update.info
new file mode 100644
index 000000000..b228f6ea4
--- /dev/null
+++ b/data/someonewhocares.org/update.info
@@ -0,0 +1 @@
+http://someonewhocares.org/hosts/hosts
diff --git a/readme.md b/readme.md
index 9dba82a5a..3f198a69a 100644
--- a/readme.md
+++ b/readme.md
@@ -12,6 +12,19 @@ Currently the `hosts` files from the following locations are amalgamated:
 * Dan Pollock at [http://someonewhocares.org/hosts/](http://someonewhocares.org/hosts/) updated regularly.
 * My own small list in raw form [here](https://raw.github.com/StevenBlack/hosts/master/data/StevenBlack/hosts).
 
+You can add any additional sources you'd like under the data/ directory. Provide a copy of the current `hosts` file and a file called
+update.info with the URL to the `hosts` file source. This will allow updateHostsFile.py to automatically update your source.
+
+## Using updateHostsFile.py
+
+This Python script will generate a unique hosts file based on the sources provided. You can either have the script go out and fetch
+an updated version over the web (defined by the update.info text file in the source's directory), or it will use the `hosts` file you
+already have checked into your source's data folder.
+
+Usage
+
+    python updateHostsFile.py
+
 ## What is a hosts file?
 
 A hosts file, named `hosts` (with no file extension), is a plain-text file used by all operating systems to map hostnames to IP addresses. 
diff --git a/updateHostsFile.py b/updateHostsFile.py
new file mode 100644
index 000000000..f0ac571e5
--- /dev/null
+++ b/updateHostsFile.py
@@ -0,0 +1,163 @@
+#!/usr/bin/env python
+
+# Script by Ben Limmer
+# https://github.com/l1m5
+#
+# This simple Python script will combine all the host files you provide
+# as sources into one, unique host file to keep you internet browsing happy.
+
+import os
+import string
+import sys
+import tempfile
+import urllib2
+
+BASEDIR_PATH = os.path.dirname(os.path.realpath(__file__))
+DATA_PATH = BASEDIR_PATH + '/data'
+DATA_FILENAMES = 'hosts'
+UPDATE_URL_FILENAME = 'update.info'
+
+duplicatesRemoved = 0;
+sources = os.listdir(DATA_PATH)
+
+def main():
+	promptForUpdate()
+	mergeFile = createInitialFile()
+	finalFile = removeDups(mergeFile)
+	finalizeFile(finalFile)
+	print 'Success! Your shiny new hosts file has been prepared.'
+
+def promptForUpdate():
+	response = query_yes_no("Do you want to update all data sources?")
+	if (response == "yes"):
+		updateAllSources()
+	else:
+		print 'OK, we\'ll stick with what we\'ve  got locally.'
+
+def updateAllSources():
+	for source in sources:
+		updateURL = getUpdateURLFromFile(source)
+		if (updateURL == None):
+			continue;
+		print 'Updating source ' + source + ' from ' + updateURL
+		updatedFile = urllib2.urlopen(updateURL)
+		updatedFile = updatedFile.read()
+		updatedFile = string.replace( updatedFile, '\r', '' ) #get rid of carriage-return symbols
+
+		dataFile   = open(DATA_PATH + '/' + source + '/' + DATA_FILENAMES, 'w')
+		dataFile.write(updatedFile)
+		dataFile.close()
+
+def getUpdateURLFromFile(source):
+	pathToUpdateFile = DATA_PATH + '/' + source + '/' + UPDATE_URL_FILENAME
+	if os.path.exists(pathToUpdateFile):
+		updateFile = open(pathToUpdateFile, 'r')
+		retURL = updateFile.readline().strip()
+		updateFile.close()
+	else:
+		retURL = None
+		print 'Warning: Can\'t find the update file for source ' + source
+		print 'Make sure that there\'s a file at ' + pathToUpdateFile
+	return retURL
+
+def createInitialFile():
+	mergeFile = tempfile.NamedTemporaryFile()
+	for source in sources:
+		curFile = open(DATA_PATH + '/' + source +'/' + DATA_FILENAMES, 'r')
+		mergeFile.write('\n# Begin ' + source + '\n')
+		mergeFile.write(curFile.read())
+		mergeFile.write('\n# End ' + source + '\n')
+	return mergeFile
+
+def removeDups(mergeFile):
+	global duplicatesRemoved
+	finalFile = open(BASEDIR_PATH + '/hosts', 'w+b')
+	mergeFile.seek(0) # reset file pointer
+
+	rules_seen = set()
+	for line in mergeFile.readlines():
+		if line[0].startswith("#") or line[0] == '\n':
+			finalFile.write(line)
+			continue;
+		strippedRule = stripRule(line)
+		if strippedRule not in rules_seen:
+			finalFile.write(line) #maintain the comments for readability
+			rules_seen.add(strippedRule)
+		else:
+			duplicatesRemoved += 1
+
+	mergeFile.close()
+
+	print 'Removed ' + str(duplicatesRemoved) + ' duplicates from the merged file'
+	return finalFile
+
+def finalizeFile(finalFile):
+	writeOpeningHeader(finalFile)
+	finalFile.close()
+
+# Some sources put comments around their rules, for accuracy we need to strip them
+# the comments are preserved in the output hosts file
+def stripRule(line):
+	splitLine = line.split()
+	if (len(splitLine) < 2) :
+		print 'A line in the hostfile is going to cause problems because it is nonstandard'
+		print 'The line reads ' + line + ' please check your data files. Maybe you have a comment without a #?'
+		sys.exit()
+	return splitLine[0] + ' ' + splitLine[1]
+
+def writeOpeningHeader(finalFile):
+	global duplicatesRemoved
+	finalFile.seek(0) #reset file pointer
+	fileContents = finalFile.read(); #save content
+	finalFile.seek(0) #write at the top
+	finalFile.write('# This file is a merged collection of hosts from reputable sources,\n')
+	finalFile.write('# with a dash of crowd sourcing via Github\n#\n')
+	finalFile.write('# Project home page: https://github.com/StevenBlack/hosts\n#\n')
+	finalFile.write('# Current sources:\n')
+	for source in sources:
+		finalFile.write('#    ' + source + '\n')
+	finalFile.write('#\n')
+	finalFile.write('# Take Note:\n')
+	finalFile.write('# Merging these sources produced ' + str(duplicatesRemoved) + ' duplicates\n')
+	finalFile.write('# ===============================================================\n')
+	finalFile.write(fileContents)
+
+
+# HELPER FUNCTIONS
+## {{{ http://code.activestate.com/recipes/577058/ (r2)
+def query_yes_no(question, default="yes"):
+    """Ask a yes/no question via raw_input() and return their answer.
+    
+    "question" is a string that is presented to the user.
+    "default" is the presumed answer if the user just hits <Enter>.
+        It must be "yes" (the default), "no" or None (meaning
+        an answer is required of the user).
+
+    The "answer" return value is one of "yes" or "no".
+    """
+    valid = {"yes":"yes",   "y":"yes",  "ye":"yes",
+             "no":"no",     "n":"no"}
+    if default == None:
+        prompt = " [y/n] "
+    elif default == "yes":
+        prompt = " [Y/n] "
+    elif default == "no":
+        prompt = " [y/N] "
+    else:
+        raise ValueError("invalid default answer: '%s'" % default)
+
+    while 1:
+        sys.stdout.write(question + prompt)
+        choice = raw_input().lower()
+        if default is not None and choice == '':
+            return default
+        elif choice in valid.keys():
+            return valid[choice]
+        else:
+            sys.stdout.write("Please respond with 'yes' or 'no' "\
+                             "(or 'y' or 'n').\n")
+## end of http://code.activestate.com/recipes/577058/ }}}
+
+
+if __name__ == "__main__":
+	main()
\ No newline at end of file