diff --git a/src/backend/port/gethostname.c b/src/backend/port/gethostname.c
new file mode 100644
index 0000000000..2971c795ee
--- /dev/null
+++ b/src/backend/port/gethostname.c
@@ -0,0 +1,20 @@
+#include <sys/types.h>
+#include <string.h>
+
+#include <sys/utsname.h>
+
+int
+gethostname(char *name, int namelen)
+{
+	static struct utsname mname;
+	static int	called = 0;
+
+	if (!called)
+	{
+		called++;
+		uname(&mname);
+	}
+	strncpy(name, mname.nodename, (SYS_NMLN < namelen ? SYS_NMLN : namelen));
+
+	return (0);
+}
diff --git a/src/backend/port/univel/port.c b/src/backend/port/getrusage.c
similarity index 51%
rename from src/backend/port/univel/port.c
rename to src/backend/port/getrusage.c
index 907e344ee7..a560d4afa3 100644
--- a/src/backend/port/univel/port.c
+++ b/src/backend/port/getrusage.c
@@ -1,34 +1,9 @@
-/*-------------------------------------------------------------------------
- *
- * port.c--
- *	  Intel x86/Intel SVR4-specific routines
- *
- * Copyright (c) 1994, Regents of the University of California
- *
- *
- * IDENTIFICATION
- *	  /usr/local/devel/pglite/cvs/src/backend/port/svr4/port.c,v 1.2 1995/03/17 06:40:19 andrew Exp
- *
- *-------------------------------------------------------------------------
- */
-#include <math.h>				/* for pow() prototype */
+#include <math.h>               /* for pow() prototype */
 
 #include <errno.h>
 #include "rusagestub.h"
 #include "port-protos.h"
 
-long
-random()
-{
-	return (lrand48());
-}
-
-void
-srandom(int seed)
-{
-	srand48((long int) seed);
-}
-
 int
 getrusage(int who, struct rusage * rusage)
 {
@@ -70,23 +45,3 @@ getrusage(int who, struct rusage * rusage)
 	return (0);
 }
 
-#include <sys/types.h>
-#include <string.h>
-
-#include <sys/utsname.h>
-
-int
-gethostname(char *name, int namelen)
-{
-	static struct utsname mname;
-	static int	called = 0;
-
-	if (!called)
-	{
-		called++;
-		uname(&mname);
-	}
-	strncpy(name, mname.nodename, (SYS_NMLN < namelen ? SYS_NMLN : namelen));
-
-	return (0);
-}
diff --git a/src/backend/port/random.c b/src/backend/port/random.c
new file mode 100644
index 0000000000..5cef1d8315
--- /dev/null
+++ b/src/backend/port/random.c
@@ -0,0 +1,12 @@
+#include <math.h>               /* for pow() prototype */
+
+#include <errno.h>
+#include "rusagestub.h"
+#include "port-protos.h"
+
+long
+random()
+{
+	return (lrand48());
+}
+
diff --git a/src/backend/port/srandom.c b/src/backend/port/srandom.c
new file mode 100644
index 0000000000..71977bde8e
--- /dev/null
+++ b/src/backend/port/srandom.c
@@ -0,0 +1,12 @@
+#include <math.h>               /* for pow() prototype */
+
+#include <errno.h>
+#include "rusagestub.h"
+#include "port-protos.h"
+
+void
+srandom(int seed)
+{
+	srand48((long int) seed);
+}
+