diff --git a/Makefile.am b/Makefile.am
index d03d90ca..85b7d998 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,6 +42,7 @@ strace_SOURCES =	\
 	getcpu.c	\
 	getcwd.c	\
 	groups.c	\
+	hostname.c	\
 	inotify.c	\
 	io.c		\
 	ioctl.c		\
diff --git a/hostname.c b/hostname.c
new file mode 100644
index 00000000..d2e0471b
--- /dev/null
+++ b/hostname.c
@@ -0,0 +1,26 @@
+#include "defs.h"
+
+int
+sys_sethostname(struct tcb *tcp)
+{
+	if (entering(tcp)) {
+		printstr(tcp, tcp->u_arg[0], tcp->u_arg[1]);
+		tprintf(", %lu", tcp->u_arg[1]);
+	}
+	return 0;
+}
+
+#if defined(ALPHA)
+int
+sys_gethostname(struct tcb *tcp)
+{
+	if (exiting(tcp)) {
+		if (syserror(tcp))
+			tprintf("%#lx", tcp->u_arg[0]);
+		else
+			printstr(tcp, tcp->u_arg[0], -1);
+		tprintf(", %lu", tcp->u_arg[1]);
+	}
+	return 0;
+}
+#endif /* ALPHA */
diff --git a/process.c b/process.c
index 18ac924c..817cf979 100644
--- a/process.c
+++ b/process.c
@@ -76,31 +76,6 @@
 # include <asm/rse.h>
 #endif
 
-int
-sys_sethostname(struct tcb *tcp)
-{
-	if (entering(tcp)) {
-		printstr(tcp, tcp->u_arg[0], tcp->u_arg[1]);
-		tprintf(", %lu", tcp->u_arg[1]);
-	}
-	return 0;
-}
-
-#if defined(ALPHA)
-int
-sys_gethostname(struct tcb *tcp)
-{
-	if (exiting(tcp)) {
-		if (syserror(tcp))
-			tprintf("%#lx", tcp->u_arg[0]);
-		else
-			printstr(tcp, tcp->u_arg[0], -1);
-		tprintf(", %lu", tcp->u_arg[1]);
-	}
-	return 0;
-}
-#endif
-
 #include "xlat/ptrace_cmds.h"
 #include "xlat/ptrace_setoptions_flags.h"
 #include "xlat/nt_descriptor_types.h"