diff --git a/dos2unix.changes b/dos2unix.changes
index f6b3d99..fa9e5da 100644
--- a/dos2unix.changes
+++ b/dos2unix.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jul  6 07:50:15 UTC 2017 - dimstar@opensuse.org
+
+- Use find -exec instead of find | xargs: helps handle cases for
+  files with spaces and quotes in their filenames.
+
 -------------------------------------------------------------------
 Wed Jul  5 19:33:38 UTC 2017 - waterlan@xs4all.nl
 
diff --git a/dos2unix.spec b/dos2unix.spec
index 4d99783..410f8cc 100644
--- a/dos2unix.spec
+++ b/dos2unix.spec
@@ -37,7 +37,7 @@ format to DOS format and unix2dos converts from UNIX to MAC format.
 
 %prep
 %setup -q
-find . -type f | xargs chmod -x
+find . -type f -exec chmod -x '{}' \;
 
 %build
 export RPM_OPT_FLAGS