diff --git a/README.md b/README.md
index 12619694..ae89a319 100755
--- a/README.md
+++ b/README.md
@@ -153,7 +153,7 @@ If you want to install it so it is available anywhere in your system, do:
         make
         sudo make install
 
-5. Install nlopt. Get armadillo from the `deps` directory or go to http://ab-initio.mit.edu/wiki/index.php/NLopt#Download_and_installation and download the latest (probably nlopt-2.4.2.tar.gz). Untar and browse in the terminal to that directory:
+5. Install nlopt. Get nlopt from the `deps` directory or go to http://ab-initio.mit.edu/wiki/index.php/NLopt#Download_and_installation and download the latest (probably nlopt-2.4.2.tar.gz). Untar and browse in the terminal to that directory:
 
         ./configure --without-octave --without-matlab
         make
diff --git a/src/Makefile.in b/src/Makefile.in
index a819145c..28fe62c8 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -32,7 +32,12 @@ ifeq "$(HOMP)" "Y"
 endif
 
 ifneq "$(CXX)" "icc"
-    OPT_FLAGS += -ffast-math -ftree-vectorize
+	OPT_FLAGS += -ftree-vectorize
+    ifneq ($(filter @host_cpu@,i386 i486 i586 i686),)
+         OPT_FLAGS += -ffloat-store
+    else
+         OPT_FLAGS += -ffast-math
+    endif
 endif
 
 NLOPT_PROGRAMS :=