diff --git a/configure.ac b/configure.ac
index c7144414dc62187d435376f39cebefdacded2cb5..71bcedca381c52d946864ef5e38c2d285945045f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5051,7 +5051,6 @@ AC_SUBST(bitmapdir)
 AC_SUBST(gamedir)
 AC_SUBST(gameuser)
 AC_SUBST(gamegroup)
-AC_SUBST(elpadir)
 ## FIXME? Nothing uses @LD_SWITCH_X_SITE@.
 ## src/Makefile.in did add LD_SWITCH_X_SITE (as a cpp define) to the
 ## end of LIBX_BASE, but nothing ever set it.
diff --git a/elpa/bin/deploy-to-core b/elpa/bin/deploy-to-core
index 77eafca0c16c97843614907e758846f095b2e73e..917f6469de7b58c5a9ef552805a554ae49ae6374 100755
--- a/elpa/bin/deploy-to-core
+++ b/elpa/bin/deploy-to-core
@@ -37,12 +37,24 @@ deploy_source(){
         ## General extensibility point for complicated packages
         ./core-deploy.sh
     else
-        rsync -i --ignore-missing-args *!(tests)*.el ../../../lisp/elpa/$SUBDIR
-        rsync -i --ignore-missing-args *.texi ../../../doc/elpa/$SUBDIR
-        rsync -i --ignore-missing-args *tests*.el ../../../test/lisp/elpa/$SUBDIR
-        if [ -e tests ]
+        if ls *!(tests)*.el >/dev/null 2>&1;
         then
-            rsync -i --ignore-missing-args tests/*.el ../../../test/lisp/elpa/$SUBDIR
+            cp -v *!(tests)*.el ../../../lisp/elpa/$SUBDIR
+        fi
+
+        if ls *.texi > /dev/null 2>&1;
+        then
+            cp -v *.texi ../../../lisp/elpa/$SUBDIR
+        fi
+
+        if ls *tests*.el > /dev/null 2>&1;
+        then
+            cp -v *tests*.el ../../../test/lisp/elpa/$SUBDIR
+        fi
+
+        if ls tests/*.el > /dev/null 2>&1;
+        then
+            cp -v tests/*.el ../../../test/lisp/elpa/$SUBDIR
         fi
     fi
 }