diff --git a/check_ironport/nagios-okplugin-check_ironport.spec b/check_ironport/nagios-okplugin-check_ironport.spec
index dad62ae..ad9a202 100644
--- a/check_ironport/nagios-okplugin-check_ironport.spec
+++ b/check_ironport/nagios-okplugin-check_ironport.spec
@@ -2,7 +2,7 @@
 
 Summary:	A Nagios plugin to check Cisco Ironport 
 Name:		nagios-okplugin-check_ironport
-Version:	1.1.4
+Version:	2
 Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/System
@@ -37,6 +37,10 @@ rm -rf %{buildroot}
 #%config(noreplace) %{_sysconfdir}/nrpe.d/check_bond.cfg
 
 %changelog
+* Thu Feb 20 2014 Pall Sigurdsson <palli@opensource.is> 2-1
+- Merge branch 'master' of https://opensource.ok.is/git/misc
+  (palli@opensource.is)
+
 * Tue Jul 31 2012 Pall Sigurdsson <palli@opensource.is> 1.1.4-1
 - initial packaging for nagios-okplugin-check_ironport (palli@opensource.is)
 
diff --git a/rel-eng/packages/nagios-okplugin-check_ironport b/rel-eng/packages/nagios-okplugin-check_ironport
index 2c6055c..ee3a9f1 100644
--- a/rel-eng/packages/nagios-okplugin-check_ironport
+++ b/rel-eng/packages/nagios-okplugin-check_ironport
@@ -1 +1 @@
-1.1.4-1 check_ironport/
+2-1 check_ironport/