diff --git a/mozilla-nss.changes b/mozilla-nss.changes
index 8bb84fe..694c194 100644
--- a/mozilla-nss.changes
+++ b/mozilla-nss.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Apr 14 18:52:59 CEST 2008 - maw@suse.de
+
+- Merge some fixes from the build service's version.
+
 -------------------------------------------------------------------
 Thu Apr 10 12:54:45 CEST 2008 - ro@suse.de
 
diff --git a/mozilla-nss.spec b/mozilla-nss.spec
index 3710ef0..f826954 100644
--- a/mozilla-nss.spec
+++ b/mozilla-nss.spec
@@ -18,7 +18,7 @@ BuildRequires:  sqlite-devel
 %endif
 License:        GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL)
 Version:        3.12.0
-Release:        9
+Release:        11
 Summary:        Network (Netscape) Security Services
 Url:            http://www.mozilla.org/projects/security/pki/nss/
 Group:          System/Libraries
@@ -104,9 +104,7 @@ cd mozilla
 cd mozilla/security/nss
 export NSPR_INCLUDE_DIR=`nspr-config --includedir`
 export NSPR_LIB_DIR=`nspr-config --libdir`
-export BUILD_OPT=1
 export OPT_FLAGS="$RPM_OPT_FLAGS -g -fno-strict-aliasing" 
-#export NSS_ENABLE_ECC=1
 export LIBDIR=%{_libdir}
 %ifarch x86_64 s390x ppc64 ia64
 export USE_64=1
@@ -114,7 +112,8 @@ export USE_64=1
 %if %suse_version > 1020
 export NSS_USE_SYSTEM_SQLITE=1
 %endif
-make nss_build_all
+MAKE_FLAGS="BUILD_OPT=1 NSS_ENABLE_ECC=1"
+make nss_build_all $MAKE_FLAGS
 
 %install
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/nss
@@ -223,6 +222,8 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_bindir}/nss-config
 
 %changelog
+* Mon Apr 14 2008 maw@suse.de
+- Merge some fixes from the build service's version.
 * Thu Apr 10 2008 ro@suse.de
 - added baselibs.conf file to build xxbit packages
   for multilib support