diff --git a/.gitignore b/.gitignore
index ee83f8d..34673c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /ejabberd-18.03.tar.gz
 /ejabberd-18.04.tar.gz
 /ejabberd-18.06.tar.gz
+/ejabberd-18.09.tar.gz
diff --git a/ejabberd-0001-Fix-PAM-service-example-name-to-match-actual-one.patch b/ejabberd-0001-Fix-PAM-service-example-name-to-match-actual-one.patch
deleted file mode 100644
index 6099db0..0000000
--- a/ejabberd-0001-Fix-PAM-service-example-name-to-match-actual-one.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Peter Lemenkov <lemenkov@gmail.com>
-Date: Tue, 16 Feb 2010 16:03:38 +0300
-Subject: [PATCH] Fix PAM service example name to match actual one
-
-Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
-
-diff --git a/ejabberd.yml.example b/ejabberd.yml.example
-index 72439e5..1acad78 100644
---- a/ejabberd.yml.example
-+++ b/ejabberd.yml.example
-@@ -263,7 +263,7 @@ auth_method: internal
- ## Authentication using PAM
- ##
- ## auth_method: pam
--## pam_service: "pamservicename"
-+## pam_service: "ejabberd"
- 
- ##
- ## Authentication using LDAP
diff --git a/ejabberd.spec b/ejabberd.spec
index 6216a06..d168036 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -3,23 +3,23 @@
 
 # Since we require the version in both BuildRequires and Requires, let's make these variables for
 # easier maintenance.
-%global cache_tab_ver 1.0.14
-%global eimp_ver 1.0.6
+%global cache_tab_ver 1.0.16
+%global eimp_ver 1.0.8
 %global epam_ver 1.0.4
-%global esip_ver 1.0.24
+%global esip_ver 1.0.26
 %global ezlib_ver 1.0.4
-%global fast_tls_ver 1.0.23
-%global fast_xml_ver 1.1.31
-%global fast_yaml_ver 1.0.15
-%global iconv_ver 1.0.8
+%global fast_tls_ver 1.0.25
+%global fast_xml_ver 1.1.34
+%global fast_yaml_ver 1.0.17
+%global iconv_ver 1.0.10
 %global luerl_ver 0.3
-%global p1_mysql_ver 1.0.6
+%global p1_mysql_ver 1.0.7
 %global p1_oauth2_ver 0.6.3
 %global p1_pgsql_ver 1.1.6
-%global p1_utils_ver 1.0.12
-%global stringprep_ver 1.0.12
-%global stun_ver 1.0.23
-%global xmpp_ver 1.2.1
+%global p1_utils_ver 1.0.13
+%global stringprep_ver 1.0.14
+%global stun_ver 1.0.25
+%global xmpp_ver 1.2.5
 
 # Define SELinux policy variables
 %global selinuxtype targeted
@@ -29,8 +29,8 @@
 
 
 Name:           ejabberd
-Version:        18.06
-Release:        3%{?dist}
+Version:        18.09
+Release:        1%{?dist}
 BuildArch:      noarch
 
 License:        GPLv2+
@@ -56,8 +56,6 @@ Source15:       ejabberd.fc
 Source16:       ejabberd.if
 
 
-# Use ejabberd as an example for PAM service name (fedora/epel-specific)
-Patch1: ejabberd-0001-Fix-PAM-service-example-name-to-match-actual-one.patch
 # Fedora-specific
 Patch3: ejabberd-0003-Install-into-BINDIR-instead-of-SBINDIR.patch
 # Fedora-specific
@@ -403,6 +401,10 @@ fi
 
 
 %changelog
+* Sun Oct 14 2018 Randy Barlow <bowlofeggs@fedoraproject.org> - 18.09-1
+- Upgrade to 18.09.
+- https://blog.process-one.net/ejabberd-18-09/
+
 * Thu Sep 06 2018 Randy Barlow <bowlofeggs@fedoraproject.org> - 18.06-3
 - Refactor to use Fedora SELinux macros documented at
   https://fedoraproject.org/wiki/SELinux/IndependentPolicy.
diff --git a/sources b/sources
index 2ab45fd..30b074f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ejabberd-18.06.tar.gz) = 357f09b0aa7da95ec196ca47328535bc52eb1de8f1de56766767bf0c4fda88667f57e445ebd3eefccc28bc5b2089ea17fe9ca2f50855e285f8c2f78708166056
+SHA512 (ejabberd-18.09.tar.gz) = 458d418b76e896602e784f921dfe3e6415520a13b53d3dbba895d086f909bc80483a89ba321632e7448aac65eef7ae541c62d47b743cfe16e73cdba2eab11907