diff --git a/mediagoblin/models.py b/mediagoblin/models.py
index 69b1f4f..a858ffe 100644
--- a/mediagoblin/models.py
+++ b/mediagoblin/models.py
@@ -18,8 +18,9 @@ import datetime, uuid
 
 from mongokit import Document, Set
 
+from mediagoblin import util
 from mediagoblin.auth import lib as auth_lib
-
+from mediagoblin import globals as mediagoblin_globals
 
 ###################
 # Custom validators
@@ -66,6 +67,7 @@ class MediaEntry(Document):
     structure = {
         'uploader': User,
         'title': unicode,
+        'slug': unicode,
         'created': datetime.datetime,
         'description': unicode,
         'media_type': unicode,
@@ -98,6 +100,15 @@ class MediaEntry(Document):
     def main_mediafile(self):
         pass
 
+    def generate_slug(self):
+        """ Generate a unique slug based on the image's title """
+
+        self['slug'] = util.slugify(self['title'])
+
+        duplicate = mediagoblin_globals.database.media_entries.find_one({'slug': self['slug']})
+        
+        if duplicate:
+            self['slug'] = "%s-%s" % (self['_id'], self['slug'])
 
 REGISTER_MODELS = [MediaEntry, User]
 
diff --git a/mediagoblin/submit/views.py b/mediagoblin/submit/views.py
index 5e262f1..eda77b0 100644
--- a/mediagoblin/submit/views.py
+++ b/mediagoblin/submit/views.py
@@ -50,6 +50,9 @@ def submit_start(request):
             # it to generate the file path
             entry.save(validate=False)
 
+            # Generate a slug from the title
+            entry.generate_slug()
+
             # Now store generate the queueing related filename
             queue_filepath = request.app.queue_store.get_unique_filepath(
                 ['media_entries',
diff --git a/mediagoblin/tests/test_util.py b/mediagoblin/tests/test_util.py
index ff40a67..7b00a07 100644
--- a/mediagoblin/tests/test_util.py
+++ b/mediagoblin/tests/test_util.py
@@ -70,6 +70,14 @@ I hope you like unit tests JUST AS MUCH AS I DO!"""
 
 I hope you like unit tests JUST AS MUCH AS I DO!"""
 
+def test_slugify():
+    assert util.slugify('a walk in the park') == 'a-walk-in-the-park'
+    assert util.slugify('A Walk in the Park') == 'a-walk-in-the-park'
+    assert util.slugify('a  walk in the park') == 'a-walk-in-the-park'
+    assert util.slugify('a walk in-the-park') == 'a-walk-in-the-park'
+    assert util.slugify('a w@lk in the park?') == 'a-w-lk-in-the-park'
+    assert util.slugify(u'a walk in the par\u0107') == 'a-walk-in-the-parc'
+    assert util.slugify(u'\u00E0\u0042\u00E7\u010F\u00EB\u0066') == 'abcdef'
 
 def test_locale_to_lower_upper():
     """
diff --git a/mediagoblin/util.py b/mediagoblin/util.py
index ac977bd..31ff4f6 100644
--- a/mediagoblin/util.py
+++ b/mediagoblin/util.py
@@ -17,9 +17,10 @@
 from email.MIMEText import MIMEText
 import smtplib
 import sys
-
+import re
 import jinja2
 import mongokit
+import translitcodec
 
 from mediagoblin import globals as mgoblin_globals
 
@@ -97,6 +98,18 @@ def import_component(import_string):
     func = getattr(module, func_name)
     return func
 
+_punct_re = re.compile(r'[\t !"#$%&\'()*\-/<=>?@\[\\\]^_`{|},.]+')
+
+def slugify(text, delim=u'-'):
+    """
+    Generates an ASCII-only slug. Taken from http://flask.pocoo.org/snippets/5/
+    """
+    result = []
+    for word in _punct_re.split(text.lower()):
+        word = word.encode('translit/long')
+        if word:
+            result.append(word)
+    return unicode(delim.join(result))
 
 ### ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ### Special email test stuff begins HERE
diff --git a/mediagoblin/views.py b/mediagoblin/views.py
index 95d0be7..7f925bb 100644
--- a/mediagoblin/views.py
+++ b/mediagoblin/views.py
@@ -20,6 +20,7 @@ from webob import Response, exc
 import wtforms
 from mongokit import ObjectId
 from mediagoblin import models
+import gettext
 
 def root_view(request):
     media_entries = request.db.MediaEntry.find(
diff --git a/setup.py b/setup.py
index 7d38e52..1fb2414 100644
--- a/setup.py
+++ b/setup.py
@@ -38,6 +38,7 @@ setup(
         'jinja2',
         'sphinx',
         'PIL',
+        'translitcodec',
         'Babel',
         ],
     test_suite='nose.collector',