diff --git a/MANIFEST.in b/MANIFEST.in
index 7c77109..06882da 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,6 @@
 include LICENSE.txt
 include CONTRIBUTORS.txt
+include avatar/media/avatar/img/default.jpg
 recursive-include docs *
 recursive-include avatar/templates/avatar *.html
 recursive-include avatar/locale/*/LC_MESSAGES *.mo *.po
\ No newline at end of file
diff --git a/avatar/models.py b/avatar/models.py
index e2939ab..4875776 100644
--- a/avatar/models.py
+++ b/avatar/models.py
@@ -5,6 +5,7 @@ from django.db import models
 from django.core.files.base import ContentFile
 from django.utils.translation import ugettext as _
 from django.utils.hashcompat import md5_constructor
+from django.utils.encoding import smart_str
 
 from django.contrib.auth.models import User
 
@@ -46,7 +47,7 @@ def avatar_file_path(instance=None, filename=None, size=None, ext=None):
         # File doesn't exist yet
         if AVATAR_HASH_FILENAMES:
             (root, ext) = os.path.splitext(filename)
-            filename = md5_constructor(filename).hexdigest()
+            filename = md5_constructor(smart_str(filename)).hexdigest()
             filename = filename + ext
     if size:
         tmppath.extend(['resized', str(size)])
diff --git a/setup.py b/setup.py
index 454a0ca..a0d48cb 100644
--- a/setup.py
+++ b/setup.py
@@ -164,6 +164,7 @@ setup(
         'avatar': [
             'templates/avatar/*.html',
             'locale/*/LC_MESSAGES/*',
+            'media/avatar/img/default.jpg'
         ],
     },
     include_package_data=True,