diff --git a/gdb/config/hppabsd.mh b/gdb/config/hppabsd.mh
new file mode 100644
index 0000000000..d22b24620e
--- /dev/null
+++ b/gdb/config/hppabsd.mh
@@ -0,0 +1,3 @@
+# Host: Hewlett-Packard PA-RISC machine, running BSD
+XDEPFILES= hppabsd-xdep.o hppa-coredep.o
+XM_FILE= xm-hppabsd.h
diff --git a/gdb/config/hppabsd.mt b/gdb/config/hppabsd.mt
new file mode 100644
index 0000000000..7a13df870c
--- /dev/null
+++ b/gdb/config/hppabsd.mt
@@ -0,0 +1,4 @@
+# TARGET: HP PA-RISC running bsd
+TDEPFILES= hppa-pinsn.o hppabsd-tdep.o exec.o
+TM_FILE= tm-hppabsd.h
+
diff --git a/gdb/config/hppahpux.mh b/gdb/config/hppahpux.mh
new file mode 100644
index 0000000000..82cd6e8748
--- /dev/null
+++ b/gdb/config/hppahpux.mh
@@ -0,0 +1,7 @@
+# Host: Hewlett-Packard PA-RISC machine, running HPUX 
+XDEPFILES= hppahpux-xdep.o hppa-coredep.o
+XM_FILE= xm-hppahpux.h
+REGEX=regex.o
+REGEX1=regex.o
+ALLOCA=alloca.o
+ALLOCA1=alloca.o
\ No newline at end of file
diff --git a/gdb/config/hppahpux.mt b/gdb/config/hppahpux.mt
new file mode 100644
index 0000000000..1df2dddaef
--- /dev/null
+++ b/gdb/config/hppahpux.mt
@@ -0,0 +1,3 @@
+# TARGET: HP PA-RISC running hpux
+TDEPFILES= hppa-pinsn.o hppahpux-tdep.o exec.o
+TM_FILE= tm-hppahpux.h
diff --git a/include/aout/hppa.h b/include/aout/hppa.h
new file mode 100644
index 0000000000..7e185de768
--- /dev/null
+++ b/include/aout/hppa.h
@@ -0,0 +1,7 @@
+#include "filehdr.h"
+#include "aouthdr.h"
+#include "scnhdr.h"
+#include "spacehdr.h"
+#include "syms.h"
+
+