diff --git a/.gitignore b/.gitignore
index 195749f..0ed84b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/nss-util-3.28.2.tar.gz
+SOURCES/nss-util-3.28.4.tar.gz
diff --git a/.nss-util.metadata b/.nss-util.metadata
index d7a7797..779d4b0 100644
--- a/.nss-util.metadata
+++ b/.nss-util.metadata
@@ -1 +1 @@
-355533d25b246ae91a54d2253757d9a17506143d SOURCES/nss-util-3.28.2.tar.gz
+cf8f65cd933957802a2ed95c2e67061fff43f350 SOURCES/nss-util-3.28.4.tar.gz
diff --git a/SOURCES/nss-util-ecpoint-encoding.patch b/SOURCES/nss-util-ecpoint-encoding.patch
deleted file mode 100644
index 494e182..0000000
--- a/SOURCES/nss-util-ecpoint-encoding.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-
-# HG changeset patch
-# User Kai Engert <kaie@kuix.de>
-# Date 1487329827 -3600
-# Node ID 0050234a859c2aac2cf8cb5092218191300b1901
-# Parent 0e25df041c8fdc8610c6f227084d11eb8ad81149
-Bug 1340103, Introduction of SECKEYECPublicKey.encoding in NSS 3.28 broke ABI, r=rrelyea/mt
-
-diff --git a/lib/util/eccutil.h b/lib/util/eccutil.h
---- a/lib/util/eccutil.h
-+++ b/lib/util/eccutil.h
-@@ -1,14 +1,15 @@
- /* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
- #ifndef _FREEBL_H_
- #define _FREEBL_H_
-
--/* point encoding type */
-+/* deprecated */
- typedef enum {
- ECPoint_Uncompressed,
-- ECPoint_XOnly
-+ ECPoint_XOnly,
-+ ECPoint_Undefined
- } ECPointEncoding;
-
- #endif /* _FREEBL_H_ */
-
diff --git a/SPECS/nss-util.spec b/SPECS/nss-util.spec
index 43e5c96..e930077 100644
--- a/SPECS/nss-util.spec
+++ b/SPECS/nss-util.spec
@@ -4,8 +4,8 @@
Summary: Network Security Services Utilities Library
Name: nss-util
-Version: 3.28.2
-Release: 1.1%{?dist}
+Version: 3.28.4
+Release: 1.0%{?dist}
License: MPLv2.0
URL: http://www.mozilla.org/projects/security/pki/nss/
Group: System Environment/Libraries
@@ -39,8 +39,6 @@ Patch7: pkcs1sig-include-prtypes.patch
# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=951455
# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=923089
Patch8: nss-util-3.19.1-tls12-mechanisms.patch
-# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1340103
-Patch9: nss-util-ecpoint-encoding.patch
%description
Utilities for Network Security Services and the Softoken module
@@ -64,9 +62,6 @@ Header and library files for doing development with Network Security Services.
%patch2 -p0 -b .prtypes
%patch7 -p0 -b .include_prtypes
%patch8 -p1 -b .tls12_mechs
-pushd nss
-%patch9 -p1 -b .ecpoint-encoding
-popd
%build
@@ -238,6 +233,9 @@ done
%{_includedir}/nss3/templates/templates.c
%changelog
+* Fri Apr 7 2017 Daiki Ueno <dueno@redhat.com> - 3.28.4-1.0
+- Rebase to nss-3.28.4 to accommodate base64 encoding issue
+
* Fri Feb 17 2017 Daiki Ueno <dueno@redhat.com> - 3.28.2-1.1
- Prevent ABI incompatibility of SECKEYECPublicKey structure