diff --git a/mpn/x86_64/copyd.as b/mpn/x86_64/amd64/copyd.as
similarity index 100%
rename from mpn/x86_64/copyd.as
rename to mpn/x86_64/amd64/copyd.as
diff --git a/mpn/x86_64/copyi.as b/mpn/x86_64/amd64/copyi.as
similarity index 100%
rename from mpn/x86_64/copyi.as
rename to mpn/x86_64/amd64/copyi.as
diff --git a/mpn/x86_64/fat/copyd.c b/mpn/x86_64/fat/copyd.c
new file mode 100644
index 00000000..c05e8ee6
--- /dev/null
+++ b/mpn/x86_64/fat/copyd.c
@@ -0,0 +1,24 @@
+/* Fat binary fallback mpn_copyd
+
+Copyright 2003 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at your
+option) any later version.
+
+The GNU MP Library is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+MA 02110-1301, USA. */
+
+
+void	mpn_copyd(mp_ptr rp,mp_srcptr sp,mp_size_t n)
+{MPN_COPYD(rp,sp,n);return;}
diff --git a/mpn/x86_64/fat/copyi.c b/mpn/x86_64/fat/copyi.c
new file mode 100644
index 00000000..600aae2e
--- /dev/null
+++ b/mpn/x86_64/fat/copyi.c
@@ -0,0 +1,24 @@
+/* Fat binary fallback mpn_copyi
+
+Copyright 2003 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or (at your
+option) any later version.
+
+The GNU MP Library is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+MA 02110-1301, USA. */
+
+
+void	mpn_copyi(mp_ptr rp,mp_srcptr sp,mp_size_t n)
+{MPN_COPYI(rp,sp,n);return;}