diff --git a/ChangeLog b/ChangeLog
index 1e9c2037..71643a6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-03-29  Sergei Shmanko
+
+	* check_ssl_cert: Fix wildcard match regex, add additional unit tests
+
 2016-03-21  Matteo Corti  <matteo@corti.li>
 
 	* check_ssl_cert (exec_with_timeout): issues a critical status
diff --git a/NEWS b/NEWS
index 16716c37..81f5f1c9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+2016-03-29 Version 1.26.0 Fixes a bug in wildcard match
 2016-03-21 Version 1.25.0 Fixes a bug on CN parsing on non-GNU systems
                           Handle wildcard certificates
 2016-03-09 Version 1.24.0 Waits for SSL Labs Results
diff --git a/VERSION b/VERSION
index ad219194..5ff8c4f5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.25.0
+1.26.0
diff --git a/check_ssl_cert b/check_ssl_cert
index c6ec164c..0e6d61c5 100755
--- a/check_ssl_cert
+++ b/check_ssl_cert
@@ -19,7 +19,7 @@
 ################################################################################
 # Constants
 
-VERSION=1.25.0
+VERSION=1.26.0
 SHORTNAME="SSL_CERT"
 
 VALID_ATTRIBUTES=",startdate,enddate,subject,issuer,serial,modulus,serial,hash,email,ocsp_uri,fingerprint,"
diff --git a/check_ssl_cert.1 b/check_ssl_cert.1
index 70f2c4e8..1b02805d 100644
--- a/check_ssl_cert.1
+++ b/check_ssl_cert.1
@@ -1,7 +1,7 @@
 .\" Process this file with
 .\" groff -man -Tascii foo.1
 .\"
-.TH "check_ssl_cert" 1 "March, 2016" "1.25.0" "USER COMMANDS"
+.TH "check_ssl_cert" 1 "March, 2016" "1.26.0" "USER COMMANDS"
 .SH NAME
 check_ssl_cert \- checks the validity of X.509 certificates
 .SH SYNOPSIS
diff --git a/check_ssl_cert.spec b/check_ssl_cert.spec
index 39dd9a27..24e7cd07 100644
--- a/check_ssl_cert.spec
+++ b/check_ssl_cert.spec
@@ -1,4 +1,4 @@
-%define version          1.25.0
+%define version          1.26.0
 %define release          0
 %define sourcename       check_ssl_cert
 %define packagename      nagios-plugins-check_ssl_cert
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/%{sourcename}.1*
 
 %changelog
+* Tue Mar 29 2016 Matteo Corti <matteo@corti.li> - 1.26.0-0
+- Updated to 1.26.0
+
 * Mon Mar 21 2016 Matteo Corti <matteo@corti.li> - 1.25.0-0
 - Updated to 1.25.0