diff -Nru nss-3.21/debian/changelog nss-3.21/debian/changelog
--- nss-3.21/debian/changelog	2016-02-04 17:52:58.000000000 +0000
+++ nss-3.21/debian/changelog	2016-02-22 15:11:37.000000000 +0000
@@ -1,3 +1,10 @@
+nss (2:3.21-0ubuntu0.12.04.2) precise-security; urgency=medium
+
+  * debian/rules: fix versioning since the last update incorrectly added
+    an epoch. (LP: #1547147)
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Mon, 22 Feb 2016 10:10:25 -0500
+
 nss (2:3.21-0ubuntu0.12.04.1) precise-security; urgency=medium
 
   * Updated to upstream 3.21 to fix a security issue and get a new CA
diff -Nru nss-3.21/debian/rules nss-3.21/debian/rules
--- nss-3.21/debian/rules	2013-11-14 21:39:06.000000000 +0000
+++ nss-3.21/debian/rules	2016-02-22 15:10:17.000000000 +0000
@@ -9,10 +9,10 @@
 $(PREPROCESS_FILES:.in=): %: %.in
 	sed 's,/@DEB_HOST_MULTIARCH@,$(DEB_HOST_MULTIARCH:%=/%),g;$(EXTRA_REPLACES)' $< > $@
 
-UPSTREAM_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: *\([^~]*\)\(~.*\)\?-.*$$/\1/ p')
+UPSTREAM_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: *\([0-9]*:\)\?\([^~]*\)\(~.*\)\?-.*$$/\2/ p')
 MOD_MAJOR_VERSION := $(word 1, $(subst ., ,$(UPSTREAM_VERSION)))
 MOD_MINOR_VERSION := $(word 2, $(subst ., ,$(UPSTREAM_VERSION)))
-MOD_PATCH_VERSION := $(word 3, $(subst ., ,$(UPSTREAM_VERSION)))
+MOD_PATCH_VERSION := $(or $(word 3, $(subst ., ,$(UPSTREAM_VERSION))),0)
 
 debian/nss.pc: EXTRA_REPLACES := s/@VERSION@/$(UPSTREAM_VERSION)/
 debian/nss-config: EXTRA_REPLACES := s/@MOD_MAJOR_VERSION@/$(MOD_MAJOR_VERSION)/;s/@MOD_MINOR_VERSION@/$(MOD_MINOR_VERSION)/;s/@MOD_PATCH_VERSION@/$(MOD_PATCH_VERSION)/