diff --git a/configure.ac b/configure.ac
index 0923bf08f..9c1440775 100644
--- a/configure.ac
+++ b/configure.ac
@@ -904,13 +904,6 @@ else
   fi
 fi
 
-# Copy */setjmp.S to target_cpu/
-AC_CONFIG_COMMANDS([grub-core/lib/target_cpu],
-  [mkdir -p grub-core/lib/target_cpu])
-AC_CONFIG_COMMANDS([setjmp.S],
-  [cp -rp $srcdir/grub-core/lib/$target_cpu/setjmp.S grub-core/lib/target_cpu/],
-  [target_cpu=$target_cpu srcdir=$srcdir])
-
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([grub-core/Makefile])
 AC_CONFIG_FILES([po/Makefile])
diff --git a/grub-core/lib/setjmp.S b/grub-core/lib/setjmp.S
new file mode 100644
index 000000000..c39c91b9c
--- /dev/null
+++ b/grub-core/lib/setjmp.S
@@ -0,0 +1,13 @@
+#if defined(__i386__)
+#include "./i386/setjmp.S"
+#elif defined(__x86_64__)
+#include "./x86_64/setjmp.S"
+#elif defined(__sparc__)
+#include "./sparc64/setjmp.S"
+#elif defined(__mips__)
+#include "./mips/setjmp.S"
+#elif defined(__powerpc__)
+#include "./powerpc/setjmp.S"
+#else
+#error "Unknwon target cpu type"
+#endif
diff --git a/grub-core/modules.def b/grub-core/modules.def
index 71215aba0..fa830e779 100644
--- a/grub-core/modules.def
+++ b/grub-core/modules.def
@@ -1214,7 +1214,7 @@ module = {
 
 module = {
   name = setjmp;
-  nodist = lib/target_cpu/setjmp.S;
+  source = lib/setjmp.S;
   extra_dist = lib/i386/setjmp.S;
   extra_dist = lib/mips/setjmp.S;
   extra_dist = lib/x86_64/setjmp.S;