diff --git a/configure.in b/configure.in
index ffafa585040..5365649056d 100644
--- a/configure.in
+++ b/configure.in
@@ -269,6 +269,7 @@ dnl see the `changequote' comment above.
       vax-*-netbsd*)	machine=vax ;;
       arm-*-netbsd*)	machine=arm ;;
       x86_64-*-netbsd*)	machine=amdx86-64 ;;
+      hppa-*-netbsd*)	machine=hp800 ;;
       shle-*-netbsd*)	machine=sh3el ;;
     esac
   ;;
@@ -606,6 +607,14 @@ dnl see the `changequote' comment above.
     esac
   ;;
 
+  hppa*-*-linux-gnu* )
+    machine=hp800 opsys=gnu-linux
+  ;;
+
+  hppa*-*-nextstep* )
+    machine=hp800 opsys=nextstep
+  ;;
+
   ## Orion machines
   orion-orion-bsd* )
     machine=orion opsys=bsd4-2