diff --git a/ChangeLog b/ChangeLog
index 35a8c010b1..03e1852114 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-02-13  Maciej W. Rozycki  <macro@mips.com>
+
+	* configure.ac <wasm32-*-*> (noconfigdirs): Add `ld'.
+	* configure: Regenerate.
+
 2018-01-30  Nick Clifton  <nickc@redhat.com>
 
 	* src-release.sh (do_proto_toplev): Add patterns for more junk files
diff --git a/configure b/configure
index 2d615a9996..0601395512 100755
--- a/configure
+++ b/configure
@@ -3860,6 +3860,9 @@ case "${target}" in
   vax-*-*)
     noconfigdirs="$noconfigdirs target-newlib target-libgloss"
     ;;
+  wasm32-*-*)
+    noconfigdirs="$noconfigdirs ld"
+    ;;
 esac
 
 # If we aren't building newlib, then don't build libgloss, since libgloss
diff --git a/configure.ac b/configure.ac
index aae94501e4..c343333652 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1191,6 +1191,9 @@ case "${target}" in
   vax-*-*)
     noconfigdirs="$noconfigdirs target-newlib target-libgloss"
     ;;
+  wasm32-*-*)
+    noconfigdirs="$noconfigdirs ld"
+    ;;
 esac
 
 # If we aren't building newlib, then don't build libgloss, since libgloss