diff --git a/images/lib/images.rb b/images/lib/images.rb
index 2ae5faa7b2..6499550346 100644
--- a/images/lib/images.rb
+++ b/images/lib/images.rb
@@ -28,7 +28,7 @@ class Engine < Rails::Engine
         # /system/images/BAhbB1sHOgZmIiMyMDEwLzA5LzAxL1NTQ19DbGllbnRfQ29uZi5qcGdbCDoGcDoKdGh1bWIiDjk0MngzNjAjYw/refinery_is_awesome.jpg
         # Officially the way to do it, from: http://markevans.github.com/dragonfly/file.URLs.html
         app_images.url_suffix = proc{|job|
-          "/#{job.name}"
+          "/#{job.uid_basename}#{job.encoded_extname || job.uid_extname}"
         }
 
         ### Extend active record ###
diff --git a/resources/lib/resources.rb b/resources/lib/resources.rb
index 25586d1025..6fae46534c 100644
--- a/resources/lib/resources.rb
+++ b/resources/lib/resources.rb
@@ -26,7 +26,7 @@ class Engine < Rails::Engine
         # /system/images/BAhbB1sHOgZmIiMyMDEwLzA5LzAxL1NTQ19DbGllbnRfQ29uZi5qcGdbCDoGcDoKdGh1bWIiDjk0MngzNjAjYw/refinery_is_awesome.pdf
         # Officially the way to do it, from: http://markevans.github.com/dragonfly/file.URLs.html
         app_resources.url_suffix = proc{|job|
-          "/#{job.name}"
+          "/#{job.uid_basename}#{job.encoded_extname || job.uid_extname}"
         }
 
         ### Extend active record ###