diff --git a/Makefile b/Makefile
index 5ac7fda..a8e94e6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-# Makefile for source rpm: e-smith-qmailanalog
+# Makefile for source rpm: smeserver-qmailanalog
 # $Id: Makefile,v 1.1 2016/02/05 21:42:31 stephdl Exp $
-NAME := e-smith-qmailanalog
+NAME := smeserver-qmailanalog
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
diff --git a/README.md b/README.md
index 28c637f..397ab00 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-qmailanalog
+# <img src="https://www.koozali.org/images/koozali/Logo/Png/Koozali_logo_2016.png" width="25%" vertical="auto" style="vertical-align:bottom"> smeserver-qmailanalog
 
-SMEServer Koozali developed git repo for e-smith-qmailanalog smeserver
+SMEServer Koozali developed git repo for smeserver-qmailanalog smeserver
 
 ## Wiki
 <br />https://wiki.koozali.org/
 
 ## Bugzilla
-Show list of outstanding bugs: [here](https://bugs.koozali.org/buglist.cgi?component=e-smith-qmailanalog&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-qmailanalog&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-qmailanalog) [here](https://bugs.koozali.org/buglist.cgi?component=e-smith-qmailanalog&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
 
diff --git a/e-smith-qmailanalog.spec b/smeserver-qmailanalog.spec
similarity index 96%
rename from e-smith-qmailanalog.spec
rename to smeserver-qmailanalog.spec
index d7e4c73..421b6d9 100644
--- a/e-smith-qmailanalog.spec
+++ b/smeserver-qmailanalog.spec
@@ -1,10 +1,10 @@
 # $Id: e-smith-qmailanalog.spec,v 1.4 2021/01/06 20:36:49 jpp Exp $
 
-Summary: e-smith module for analysing qmail logs
-%define name e-smith-qmailanalog
+Summary: smeserver module for analysing qmail logs
+%define name smeserver-qmailanalog
 Name: %{name}
 %define version 2.6.0
-%define release 5
+%define release 6
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -19,6 +19,9 @@ BuildRequires: e-smith-devtools
 AutoReqProv: no
 
 %changelog
+* Mon Mar 11 2024 rename-e-smith-pkg.sh by Trevor Batley <trevor@batley.id.au> 2.6.0-6.sme
+- Rename to smeserver-qmailanalog [SME: 12359]
+
 * Wed Jul 12 2023 cvs2git.sh aka Brian Read <brianr@koozali.org> 2.6.0-5.sme
 - Roll up patches and move to git repo [SME: 12338]
 
@@ -240,8 +243,9 @@ AutoReqProv: no
 * Wed Aug 16 2000 Peter Samuel <peters@e-smith.com>
 - initial release
 
+Provides: e-smith-qmailanalog
 %description
-e-smith cgi interface to qmailanalog.
+smeserver cgi interface to qmailanalog.
 
 qmailanalog provides a number of programs to help analyse qmail logs.
 This program uses the e-smith manager to allow the administrator to