diff --git a/Makefile b/Makefile
index 95f28a1..18544c6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-# Makefile for source rpm: e-smith-qmail
+# Makefile for source rpm: smeserver-qmail
 # $Id: Makefile,v 1.1 2016/02/05 21:46:43 stephdl Exp $
-NAME := e-smith-qmail
+NAME := smeserver-qmail
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
diff --git a/README.md b/README.md
index c1977bd..3614d61 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,13 @@
-# <img src="https://www.koozali.org/images/koozali/Logo/Png/Koozali_logo_2016.png" width="25%" vertical="auto" style="vertical-align:bottom"> e-smith-qmail
+# <img src="https://www.koozali.org/images/koozali/Logo/Png/Koozali_logo_2016.png" width="25%" vertical="auto" style="vertical-align:bottom"> smeserver-qmail
 
-SMEServer Koozali developed git repo for e-smith-qmail smeserver
+SMEServer Koozali developed git repo for smeserver-qmail smeserver
 
 ## Wiki
 <br />https://wiki.koozali.org/
 
 ## Bugzilla
-Show list of outstanding bugs: [here](https://bugs.koozali.org/buglist.cgi?component=e-smith-qmail&product=SME%20Server%2010.X&query_format=advanced&limit=0&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=CONFIRMED)
+Show list of outstanding bugs: [here](https://bugs.koozali.org/buglist.cgi?component=smeserver-qmail&product=SME%20Server%2010.X&query_format=advanced&limit=0&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=CONFIRMED)\
+And a list of outstanding Legacy bugs: (e-smith-qmail) [here](https://bugs.koozali.org/buglist.cgi?component=e-smith-qmail&product=SME%20Server%2010.X&query_format=advanced&limit=0&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=CONFIRMED)
 
 ## Description
 
@@ -14,4 +15,4 @@ Show list of outstanding bugs: [here](https://bugs.koozali.org/buglist.cgi?compo
 *Once it has been checked, then this comment will be deleted*
 <br />
 
-E-smith-qmail is an open source email server software designed to facilitate email communication for small- and medium-sized businesses. It is highly customizable, with support for multiple domains, virtual domains, forwarding, aliases, and mailing lists, and its features can be adapted to meet the specific communication needs of any organization. With its straightforward web-based administration interface, e-smith-qmail can be easily configured for optimal security and performance. Additionally, its advanced spam filtering technology helps to ensure that email communication remains safe and secure for both senders and recipients.
+E-smith-qmail is an open source email server software designed to facilitate email communication for small- and medium-sized businesses. It is highly customizable, with support for multiple domains, virtual domains, forwarding, aliases, and mailing lists, and its features can be adapted to meet the specific communication needs of any organization. With its straightforward web-based administration interface, smeserver-qmail can be easily configured for optimal security and performance. Additionally, its advanced spam filtering technology helps to ensure that email communication remains safe and secure for both senders and recipients.
diff --git a/e-smith-qmail.spec b/smeserver-qmail.spec
similarity index 98%
rename from e-smith-qmail.spec
rename to smeserver-qmail.spec
index 3b251bf..c53c95b 100644
--- a/e-smith-qmail.spec
+++ b/smeserver-qmail.spec
@@ -1,10 +1,10 @@
 # $Id: e-smith-qmail.spec,v 1.17 2022/04/06 04:38:59 jpp Exp $
 
 Summary: startup scripts for Dan Bernstein's qmail package
-%define name e-smith-qmail
+%define name smeserver-qmail
 Name: %{name}
 %define version 2.6.0
-%define release 15
+%define release 16
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -27,6 +27,9 @@ Obsoletes: qmail-workaround
 AutoReqProv: no
 
 %changelog
+* Mon Mar 11 2024 rename-e-smith-pkg.sh by Trevor Batley <trevor@batley.id.au> 2.6.0-16.sme
+- Rename to smeserver-qmail [SME: 12359]
+
 * Wed Jul 12 2023 cvs2git.sh aka Brian Read <brianr@koozali.org> 2.6.0-15.sme
 - Roll up patches and move to git repo [SME: 12338]
 
@@ -390,6 +393,7 @@ AutoReqProv: no
 - [1.1.0-01]
 - initial release
 
+Provides: e-smith-qmail
 %description
 Startup scripts for Dan Bernstein's qmail package.