diff -r -u -x *.P -x Makefile gnome-pim-cvs/gnomecard/address-conduit.c gnome-pim/gnomecard/address-conduit.c
--- gnome-pim-cvs/gnomecard/address-conduit.c	Sun Jan  2 23:03:13 2000
+++ gnome-pim/gnomecard/address-conduit.c	Sun Jan  2 23:04:49 2000
@@ -326,9 +326,9 @@
 	if (stat (bak_fname, &s) != -1 || errno != ENOENT) {
 
 		cmd = g_malloc (strlen (real_fname) + 
-				strlen (bak_fname) + 8);
+				strlen (bak_fname) + 12);
 		
-		sprintf (cmd, "mv -f %s %s", real_fname,bak_fname);
+		sprintf (cmd, "mv -f \"%s\" \"%s\"", real_fname,bak_fname);
 			
 		system (cmd);
 		g_free (cmd);
diff -r -u -x *.P -x Makefile gnome-pim-cvs/gnomecard/gnomecard.c gnome-pim/gnomecard/gnomecard.c
--- gnome-pim-cvs/gnomecard/gnomecard.c	Sun Jan  2 23:03:13 2000
+++ gnome-pim/gnomecard/gnomecard.c	Sun Jan  2 23:07:43 2000
@@ -266,9 +266,9 @@
 		
 		if (i != '0') {
 			cmd = g_malloc (strlen (bak_fname) + 
-					strlen (bak_fname2) + 8);
+					strlen (bak_fname2) + 12);
 		
-			sprintf (cmd, "mv -f %s %s", bak_fname, bak_fname2);
+			sprintf (cmd, "mv -f \"%s\" \"%s\"", bak_fname, bak_fname2);
 			
 			system (cmd);
 			g_free (cmd);
@@ -276,8 +276,8 @@
 		}
 	}
 	
-	cmd = g_malloc (strlen (bak_fname) + strlen (real_fname) + 8);
-	sprintf (cmd, "cp -f %s %s", real_fname, bak_fname);
+	cmd = g_malloc (strlen (bak_fname) + strlen (real_fname) + 12);
+	sprintf (cmd, "cp -f \"%s\" \"%s\"", real_fname, bak_fname);
 	system (cmd);
 	
 	g_free (cmd);