diff --git a/base/runit/packages/postgresql-env_LOGDIR.txt b/base/runit/packages/postgresql-env_LOGDIR.txt
deleted file mode 100644
index 8099f5f3b..000000000
--- a/base/runit/packages/postgresql-env_LOGDIR.txt
+++ /dev/null
@@ -1 +0,0 @@
-D_logdir
diff --git a/base/runit/packages/postgresql-env_PGDATA.txt b/base/runit/packages/postgresql-env_PGDATA.txt
deleted file mode 100644
index 7f8b2aa57..000000000
--- a/base/runit/packages/postgresql-env_PGDATA.txt
+++ /dev/null
@@ -1 +0,0 @@
-D_localstatedir/data
diff --git a/base/runit/packages/postgresql-log_run.txt b/base/runit/packages/postgresql-log_run.txt
deleted file mode 100644
index 08f377e1c..000000000
--- a/base/runit/packages/postgresql-log_run.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# Filename: package/.../runit/packages/postgresql-log_run.txt
-# Copyright (C) 2006 The T2 SDE Project
-#
-# More information can be found in the files COPYING and README.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- SDE-COPYRIGHT-NOTE-END ---
-
-exec 2>&1
-
-LOGDIR=$( cat ../env/LOGDIR )
-if [ ! -d $LOGDIR ]; then
-	mkdir -p $LOGDIR
-	chown log $LOGDIR
-fi
-exec chpst -ulog svlogd -t $LOGDIR
diff --git a/base/runit/packages/postgresql-postgresql.tail b/base/runit/packages/postgresql-postgresql.tail
new file mode 100644
index 000000000..9618f7bec
--- /dev/null
+++ b/base/runit/packages/postgresql-postgresql.tail
@@ -0,0 +1,2 @@
+run	envdir ./env setuidgid postgres D_bindir/postmaster -i
+log	postgresql
diff --git a/base/runit/packages/postgresql-run.txt b/base/runit/packages/postgresql-run.txt
deleted file mode 100644
index ca97dd3ef..000000000
--- a/base/runit/packages/postgresql-run.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# Filename: package/.../runit/packages/postgresql-run.txt
-# Copyright (C) 2007 The OpenSDE Project
-# Copyright (C) 2006 The T2 SDE Project
-#
-# More information can be found in the files COPYING and README.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License. A copy of the
-# GNU General Public License can be found in the file COPYING.
-# --- SDE-COPYRIGHT-NOTE-END ---
-
-exec 2>&1
-exec envdir ./env setuidgid postgres D_bindir/postmaster -i