diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ff53cf17c..e26454e95 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2010-03-24  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org-attach.el (org-attach-commit): Remove dependence on xargs.
+
 	* org-latex.el (org-export-latex-fontify): Do not mistake table.el
 	borders for strike-through emphasis.
 
diff --git a/lisp/org-attach.el b/lisp/org-attach.el
index 0428001b2..61b85c4fa 100644
--- a/lisp/org-attach.el
+++ b/lisp/org-attach.el
@@ -241,12 +241,17 @@ the ATTACH_DIR property) their own attachment directory."
   "Commit changes to git if `org-attach-directory' is properly initialized.
 This checks for the existence of a \".git\" directory in that directory."
   (let ((dir (expand-file-name org-attach-directory)))
-    (if (file-exists-p (expand-file-name ".git" dir))
-	(shell-command
-	 (concat "(cd " dir "; "
-		 " git add .; "
-		 " git ls-files --deleted -z | xargs -0 git rm; "
-		 " git commit -m 'Synchronized attachments')")))))
+    (when (file-exists-p (expand-file-name ".git" dir))
+      (with-temp-buffer
+	(cd dir)
+	(shell-command "git add .")
+	(shell-command "git ls-files --deleted -z" t)
+	(mapc '(lambda (file)
+		 (unless (string= file "")
+		   (shell-command
+		    (concat "git rm \"" file "\""))))
+	      (split-string (buffer-string) ""))
+	(shell-command "git commit -m 'Synchronized attachments'")))))
 
 (defun org-attach-tag (&optional off)
   "Turn the autotag on or (if OFF is set) off."