diff --git a/ChangeLog b/ChangeLog
index 03e1852114..edb69ed8b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-04-30  Francois H. Theron <francois.theron@netronome.com>
+
+	* config.sub: Added "nfp" to basic_machine list.
+	* configure.ac: Added "nfp" target.
+	* configure: Regenerate.
+
 2018-02-13  Maciej W. Rozycki  <macro@mips.com>
 
 	* configure.ac <wasm32-*-*> (noconfigdirs): Add `ld'.
diff --git a/configure b/configure
index 0601395512..69c99e99cc 100755
--- a/configure
+++ b/configure
@@ -3777,6 +3777,10 @@ case "${target}" in
   mt-*-*)
     noconfigdirs="$noconfigdirs sim"
     ;;
+  nfp-*-*)
+    noconfigdirs="$noconfigdirs ld gas gdb gprof sim"
+    noconfigdirs="$noconfigdirs $target_libraries"
+    ;;
   powerpc-*-aix*)
     # copied from rs6000-*-* entry
     noconfigdirs="$noconfigdirs gprof"
diff --git a/configure.ac b/configure.ac
index c343333652..a1edc369a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1108,6 +1108,10 @@ case "${target}" in
   mt-*-*)
     noconfigdirs="$noconfigdirs sim"
     ;;
+  nfp-*-*)
+    noconfigdirs="$noconfigdirs ld gas gdb gprof sim"
+    noconfigdirs="$noconfigdirs $target_libraries"
+    ;;
   powerpc-*-aix*)
     # copied from rs6000-*-* entry
     noconfigdirs="$noconfigdirs gprof"