diff --git a/saddle.py b/saddle.py
index 8e95db1..d81e9c7 100644
--- a/saddle.py
+++ b/saddle.py
@@ -3,6 +3,7 @@
 A file hosting service similar to Pomf and Uguu but without the public nature.
 """
 import os
+import re
 import time
 import string
 import random
@@ -197,7 +198,7 @@ def download_file(url, timeout=10, max_file_size=config.client_max_size):
 
 		if r.headers.get('Content-Disposition'):
 			fname = re.search(r'filename="(.+)"',
-					r.headers['content-disposition'])
+					r.headers['content-disposition']).group(1)
 		else:
 			fname = os.path.basename(url)
 	return (fname, temp)