diff --git a/.gitignore b/.gitignore
index bb574dd..8c7f88f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 /freeradius-server-3.0.4.tar.bz2
 /freeradius-server-3.0.7.tar.bz2
 /freeradius-server-3.0.8.tar.bz2
+/freeradius-server-3.0.9.tar.bz2
diff --git a/freeradius-redhat-config.patch b/freeradius-redhat-config.patch
index d0b658e..5fcd16b 100644
--- a/freeradius-redhat-config.patch
+++ b/freeradius-redhat-config.patch
@@ -1,7 +1,7 @@
-From 3f5aac1af1da83cb2212fdd5293f76e1c252af0e Mon Sep 17 00:00:00 2001
+From 8af37f606e89367f360cce012e0e1c363b44a50f Mon Sep 17 00:00:00 2001
 From: Nikolai Kondrashov <Nikolai.Kondrashov@redhat.com>
 Date: Mon, 8 Sep 2014 12:32:13 +0300
-Subject: [PATCH 1/1] Adjust configuration to fit Red Hat specifics
+Subject: [PATCH] Adjust configuration to fit Red Hat specifics
 
 ---
  raddb/mods-available/eap | 4 ++--
@@ -9,10 +9,10 @@ Subject: [PATCH 1/1] Adjust configuration to fit Red Hat specifics
  2 files changed, 5 insertions(+), 6 deletions(-)
 
 diff --git a/raddb/mods-available/eap b/raddb/mods-available/eap
-index 165971a..d8a695a 100644
+index 10026ec..212f25b 100644
 --- a/raddb/mods-available/eap
 +++ b/raddb/mods-available/eap
-@@ -436,7 +436,7 @@ eap {
+@@ -440,7 +440,7 @@ eap {
  			#
  			#  You should also delete all of the files
  			#  in the directory when the server starts.
@@ -21,7 +21,7 @@ index 165971a..d8a695a 100644
  
  			#  The command used to verify the client cert.
  			#  We recommend using the OpenSSL command-line
-@@ -450,7 +450,7 @@ eap {
+@@ -454,7 +454,7 @@ eap {
  			#  in PEM format.  This file is automatically
  			#  deleted by the server when the command
  			#  returns.
@@ -31,7 +31,7 @@ index 165971a..d8a695a 100644
  
  		#
 diff --git a/raddb/radiusd.conf.in b/raddb/radiusd.conf.in
-index fb7d1bd..ae8be51 100644
+index c62f4ff..625f434 100644
 --- a/raddb/radiusd.conf.in
 +++ b/raddb/radiusd.conf.in
 @@ -70,8 +70,7 @@ certdir = ${confdir}/certs
@@ -56,5 +56,5 @@ index fb7d1bd..ae8be51 100644
  	#  Core dumps are a bad thing.  This should only be set to
  	#  'yes' if you're debugging a problem with the server.
 -- 
-2.1.4
+2.5.0
 
diff --git a/freeradius.spec b/freeradius.spec
index 16e9e57..db06094 100644
--- a/freeradius.spec
+++ b/freeradius.spec
@@ -1,7 +1,7 @@
 Summary: High-performance and highly configurable free RADIUS server
 Name: freeradius
-Version: 3.0.8
-Release: 3%{?dist}
+Version: 3.0.9
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
 URL: http://www.freeradius.org/
@@ -235,7 +235,7 @@ install -m 0644 %{SOURCE104} %{buildroot}%{_sysconfdir}/tmpfiles.d/radiusd.conf
 
 # install SNMP MIB files
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/snmp/mibs/
-install -m 644 mibs/*RADIUS*.txt $RPM_BUILD_ROOT%{_datadir}/snmp/mibs/
+install -m 644 mibs/*RADIUS*.mib $RPM_BUILD_ROOT%{_datadir}/snmp/mibs/
 
 # remove unneeded stuff
 rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/raddb/certs/*.crt
@@ -602,6 +602,7 @@ exit 0
 %{_libdir}/freeradius/rlm_sql.so
 %{_libdir}/freeradius/rlm_sqlcounter.so
 %{_libdir}/freeradius/rlm_sqlippool.so
+%{_libdir}/freeradius/rlm_sqlhpwippool.so
 %{_libdir}/freeradius/rlm_sql_null.so
 %{_libdir}/freeradius/rlm_unix.so
 %{_libdir}/freeradius/rlm_unpack.so
@@ -637,7 +638,7 @@ exit 0
 %doc %{_mandir}/man8/radrelay.8.gz
 
 # MIB files
-%{_datadir}/snmp/mibs/*RADIUS*.txt
+%{_datadir}/snmp/mibs/*RADIUS*.mib
 
 %files doc
 
@@ -782,6 +783,9 @@ exit 0
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/mods-available/rest
 
 %changelog
+* Wed Aug 19 2015 Nikolai Kondrashov <Nikolai.Kondrashov@redhat.com> - 3.0.9-1
+- Upgrade to upstream v3.0.9 release.
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index ab31f90..50b9733 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-59427bd3cc2ebd5ad62ee9dcc7d943c5  freeradius-server-3.0.8.tar.bz2
+37900d34de757734b430ffa9c5ffd246  freeradius-server-3.0.9.tar.bz2