diff --git a/distribusi/distribusi/distribusi.py b/distribusi/distribusi/distribusi.py
index f336ce8..947ec90 100644
--- a/distribusi/distribusi/distribusi.py
+++ b/distribusi/distribusi/distribusi.py
@@ -1,9 +1,10 @@
-# -*- coding: utf-8 -*- 
+# -*- coding: utf-8 -*-
 
 import base64
 import os
 import subprocess
 import re
+from urllib.parse import quote
 
 from io import BytesIO
 
@@ -64,12 +65,12 @@ def thumbnail(image, name, args):
                 im = im.rotate(270, expand=True)
             elif exif[orientation] == 8:
                 im = im.rotate(90, expand=True)
-        
+
         if (im.mode == 'RGBA'):
             bg = Image.new('RGBA', im.size, (255,255,255))
             composite = Image.alpha_composite(bg, im)
             im=composite.convert('RGB')
-        
+
         output = BytesIO()
         im.save(output, format='JPEG')
         im_data = output.getvalue()
@@ -87,7 +88,7 @@ def thumbnail(image, name, args):
 
         return (
             "<figure><a href='{}'><img class='thumbnail' src='data:image/jpg;base64,{}'></a><figcaption>{}</figcaption></figure>"
-        ).format(name, data_url, cap)
+        ).format(quote(name), data_url, cap)
     except Exception as e:
         print('Thumbnailer:', e)
         cap = name
@@ -96,7 +97,7 @@ def thumbnail(image, name, args):
             folder_name = m.group('name')
             file_name = m.group('file')
             cap = folder_name + "/" + file_name
-        return "<figure><a href='{}'><img src='{}'></a><figcaption>{}</figcaption></figure>".format(name, name, cap)
+        return "<figure><a href='{}'><img src='{}'></a><figcaption>{}</figcaption></figure>".format(quote(name), name, cap)
 
 
 def div(args, type_, subtype, tag, name, fid):
@@ -312,7 +313,7 @@ def distribusify(args, directory, freg):  # noqa
                         print('Found', name, 'as', mime)
 
                     if type_ in FILE_TYPES:
-                        
+
                         a = FILE_TYPES[type_].format(name, c, c)
 
                         # expansion for different kind of text files