diff --git a/packages/addons/addon-depends/nspr/package.mk b/packages/addons/addon-depends/nspr/package.mk
index 6c8706f5d8..81e52b61f3 100644
--- a/packages/addons/addon-depends/nspr/package.mk
+++ b/packages/addons/addon-depends/nspr/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="nspr"
-PKG_VERSION="4.13"
+PKG_VERSION="4.13.1"
 PKG_ARCH="any"
 PKG_LICENSE="Mozilla Public License"
 PKG_SITE="http://www.linuxfromscratch.org/blfs/view/svn/general/nspr.html"
diff --git a/packages/addons/addon-depends/nss/package.mk b/packages/addons/addon-depends/nss/package.mk
index ca61f3de85..8d9cd28e00 100644
--- a/packages/addons/addon-depends/nss/package.mk
+++ b/packages/addons/addon-depends/nss/package.mk
@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="nss"
-PKG_VERSION="3.27.1"
-PKG_SHA256="a3368812d7a9714115e76eae8b3f4b062d8407834d374691f4a297a0e54a737a"
+PKG_VERSION="3.29.5"
+PKG_SHA256="8cb8624147737d1b4587c50bf058afbb6effc0f3c205d69b5ef4077b3bfed0e4"
 PKG_ARCH="any"
 PKG_LICENSE="Mozilla Public License"
 PKG_SITE="http://ftp.mozilla.org/"
-PKG_URL="http://ftp.mozilla.org/pub/security/nss/releases/NSS_3_27_1_RTM/src/nss-3.27.1-with-nspr-4.13.tar.gz"
+PKG_URL="http://ftp.mozilla.org/pub/security/nss/releases/NSS_3_29_5_RTM/src/nss-3.29.5-with-nspr-4.13.1.tar.gz"
 PKG_DEPENDS_TARGET="toolchain nss:host nspr zlib"
 PKG_SECTION="security"
 PKG_SHORTDESC="The Network Security Services (NSS) package is a set of libraries designed to support cross-platform development of security-enabled client and server applications"
diff --git a/packages/addons/addon-depends/nss/patches/nss-02_3.15.5-standalone-1.patch b/packages/addons/addon-depends/nss/patches/nss-02_3.15.5-standalone-1.patch
index 815e634fa7..4e3217806e 100644
--- a/packages/addons/addon-depends/nss/patches/nss-02_3.15.5-standalone-1.patch
+++ b/packages/addons/addon-depends/nss/patches/nss-02_3.15.5-standalone-1.patch
@@ -222,12 +222,12 @@ Description:             Adds auto-generated nss.pc and nss-config script, and a
 +
 --- a/nss/Makefile	2013-05-28 23:43:24.000000000 +0200
 +++ b/nss/Makefile	2013-07-02 14:52:58.328084334 +0200
-@@ -44,7 +44,7 @@
+@@ -46,7 +46,7 @@
  # (7) Execute "local" rules. (OPTIONAL).                              #
  #######################################################################
  
--nss_build_all: build_nspr all
-+nss_build_all: all
+-nss_build_all: build_nspr all latest
++nss_build_all: all latest
  
  nss_clean_all: clobber_nspr clobber
  
@@ -237,5 +237,5 @@ Description:             Adds auto-generated nss.pc and nss-config script, and a
  
  RELEASE = nss
  
--DIRS = coreconf lib cmd external_tests
+-DIRS = coreconf lib cmd gtests
 +DIRS = coreconf lib cmd config
diff --git a/packages/addons/addon-depends/nss/patches/nss-03_gcc7.patch b/packages/addons/addon-depends/nss/patches/nss-03_gcc7.patch
new file mode 100644
index 0000000000..5f17718ad3
--- /dev/null
+++ b/packages/addons/addon-depends/nss/patches/nss-03_gcc7.patch
@@ -0,0 +1,42 @@
+From a1d2ef6a8e1bc721e44640bdb85747deaf8edcca Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 19 Apr 2017 10:50:37 -0700
+Subject: [PATCH] Fix warnings found with gcc7
+
+GCC7 finds more type conversion issues
+
+| pkix_pl_ocsprequest.c: In function 'pkix_pl_OcspRequest_Hashcode':
+| pkix_pl_ocsprequest.c:92:60: error: '<<' in boolean context, did you mean '<' ? [-Werror=int-in-bool-context]
+|          *pHashcode = (((((extensionHash << 8) || certHash) << 8) ||
+|                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~
+| pkix_pl_ocsprequest.c:93:27: error: '<<' in boolean context, did you mean '<' ? [-Werror=int-in-bool-context]
+|          *pHashcode = (((((extensionHash << 8) || certHash) << 8) ||
+|                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+|                  dateHash) << 8) || signerHash;
+|                  ~~~~~~~~~~^~~~~
+| cc1: all warnings being treated as errors
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_ocsprequest.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_ocsprequest.c b/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_ocsprequest.c
+index 171a3d2..d5eef88 100644
+--- a/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_ocsprequest.c
++++ b/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_ocsprequest.c
+@@ -89,7 +89,7 @@ pkix_pl_OcspRequest_Hashcode(
+         PKIX_HASHCODE(ocspRq->signerCert, &signerHash, plContext,
+                 PKIX_CERTHASHCODEFAILED);
+ 
+-        *pHashcode = (((((extensionHash << 8) || certHash) << 8) ||
++        *pHashcode = ((PKIX_UInt32)(((PKIX_UInt32)((extensionHash << 8) || certHash) << 8) ||
+                 dateHash) << 8) || signerHash;
+ 
+ cleanup:
+-- 
+2.12.2
+
+