diff --git a/postfix.spec b/postfix.spec
index abe7ac6..7d7bc0b 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -44,12 +44,12 @@
 
 Name: postfix
 Summary: Postfix Mail Transport Agent
-Version: 3.2.5
-Release: 5%{?dist}
+Version: 3.3.1
+Release: 1%{?dist}
 Epoch: 2
 Group: System Environment/Daemons
 URL: http://www.postfix.org
-License: IBM and GPLv2+
+License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+)
 Requires(post): systemd systemd-sysv
 Requires(post): %{_sbindir}/alternatives
 Requires(pre): %{_sbindir}/groupadd
@@ -233,8 +233,8 @@ done
 
 %build
 unset AUXLIBS AUXLIBS_LDAP AUXLIBS_PCRE AUXLIBS_MYSQL AUXLIBS_PGSQL AUXLIBS_SQLITE AUXLIBS_CDB
-CCARGS="-fPIC -I%{_includedir}/nsl"
-AUXLIBS="-L%{_libdir}/nsl -lnsl"
+CCARGS="-fPIC"
+AUXLIBS="-lnsl"
 
 %ifarch s390 s390x ppc
 CCARGS="${CCARGS} -fsigned-char"
@@ -736,6 +736,13 @@ fi
 %endif
 
 %changelog
+* Mon Jul  9 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.3.1-1
+- New version
+  Resolves: rhbz#1548222
+- Updated libnsl2 library and header paths
+  Resolves: rhbz#1543928
+- Updated license for dual licensing
+
 * Mon Apr 30 2018 Pete Walter <pwalter@fedoraproject.org> - 2:3.2.5-5
 - Rebuild for ICU 61.1
 
diff --git a/sources b/sources
index 9c62927..20bc2eb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
+SHA512 (postfix-3.3.1.tar.gz) = 2307f50f8b7dab1db46ebe4ae30bc5682a25b9c49ae5ae65aa95b4620bb5450dd5929977c0f34b9e73a92ca6af36fd8e24167732420a1a2d89167c7a3b197276
 SHA512 (pflogsumm-1.1.5.tar.gz) = 994d660692dfea38a1dd9866d15f15035657e85131c1f5a2cd82baa5bd4ad987a00939cb5233f316d2090014c52ae68ef20db0c893f8634969484e0e74678f4d
-SHA512 (postfix-3.2.5.tar.gz) = ffd07e8664d41a5c40b7f3f7511a4c4cc57310d103395b12f2f7e9499d1f901768d6ebb1d5d1588d6fdb834ad2548a9df6d925ff3d7f74d74764a6f6f550ecb6