diff -u usb-imagewriter-0.1.3/debian/changelog usb-imagewriter-0.1.3/debian/changelog
--- usb-imagewriter-0.1.3/debian/changelog
+++ usb-imagewriter-0.1.3/debian/changelog
@@ -1,3 +1,10 @@
+usb-imagewriter (0.1.3-0ubuntu2) karmic; urgency=low
+
+  * Used a list for the arguments in both 'Popen' lines, so we don't have to
+    worry about file names with funky characters.
+
+ -- Christopher Pavlina <pavlina.chris@gmail.com>  Sat, 17 Oct 2009 22:42:11 -0400
+
 usb-imagewriter (0.1.3-0ubuntu1) jaunty; urgency=low
 
   * New upstream, fixes for (LP: #363992):
only in patch2:
unchanged:
--- usb-imagewriter-0.1.3.orig/lib/imagewriter.py
+++ usb-imagewriter-0.1.3/lib/imagewriter.py
@@ -146,7 +146,7 @@
              self.emergency()
 
     def raw_write(self, source, target):
-        data = Popen(['ls -l '+source], shell=True, stdout=PIPE, stderr=PIPE)
+        data = Popen(['ls', '-l', source], shell=False, stdout=PIPE, stderr=PIPE)
         src_size = float(data.stdout.readline().split()[4])*1.0
         progress = self.wTree.get_widget("progressbar")
         progress.set_sensitive(True)
@@ -154,7 +154,7 @@
         self.logger(_('Executing: dd if=')+source+' of='+target)
         while gtk.events_pending():
            gtk.main_iteration(True)
-        output = Popen(['dd if='+source+' of='+target+' bs=1024'], stdout=PIPE, stderr=STDOUT, shell=True)
+        output = Popen(['dd', 'if=%s'%source, 'of=%s'%target, 'bs=1024'], stdout=PIPE, stderr=STDOUT, shell=False)
         self.ddpid = output.pid
         while output.stdout.readline():
             line = output.stdout.readline().strip()