diff --git a/src/configure b/src/configure
index 451124b..9c2489f 100755
--- a/src/configure
+++ b/src/configure
@@ -22,6 +22,7 @@ Usage: ./configure [flags] [compiler/architecture]
 
     Parallel option flags:
       -lam        Use LAM/MPI (LAM_HOME must be set)
+      -openmpi    Use OpenMPI (OMPI_HOME must be set)
       -mpi        Use native MPI
       -mpich      Use MPICH (MPICH_HOME must be set)
       -mplite     Use MP_Lite (MPLITE_HOME must be set)
@@ -81,6 +82,7 @@ verbosity=''
 while [ $# -gt 0 ]; do
     case "$1" in
     -lam)     parallel="lam" ;;
+    -openmpi) parallel="openmpi" ;;
     -mpi)     parallel="mpi" ;;
     -mpich)   parallel="mpich" ;;
     -mplite)  parallel="mplite" ;;
@@ -242,6 +244,21 @@ lam)
     fppflags="-I$LAM_HOME/include $fppflags -DMPI "
     ;;
 
+openmpi)
+    if [ -z "$OMPI_HOME" ]; then
+       PAR="OMPI"
+       FILES="mpif.h"
+       EXAMPLE="/usr/local/openmpi/intel-10.0"
+       par_error
+    fi
+    echo "OMPI_HOME is set to $OMPI_HOME"
+    ompilibs=`$OMPI_HOME/bin/mpif90 -showme | perl -p -e 's/(-[lL]\S+\s)|\S+\s/$1/g'`
+    loadlib="$loadlib $ompilibs"
+    fppflags="-I$OMPI_HOME/include $fppflags -DMPI "
+    fortflag="-I$OMPI_HOME/include"
+    ;;
+   
+
 mpi)
     loadlib="$loadlib -lmpi"
     fppflags="$fppflags -DMPI "
@@ -441,8 +458,8 @@ ifc7|ifort|ia32_ifort)
             echo "    The MKL is recommended for optimal performance."
         else
             echo "MKL_HOME is set to $MKL_HOME"
-            if [ -d $MKL_HOME/lib/32 ]; then
-                mkll=$MKL_HOME/lib/32
+            if [ -d $MKL_HOME/lib/em64t ]; then
+                mkll=$MKL_HOME/lib/em64t
                 echo "Using MKL libraries from $mkll"
             else
                 echo "MKL libraries were not found !"
@@ -965,8 +982,8 @@ CPPFLAGS=$cppflags \$(AMBERBUILDFLAGS)
 FPPFLAGS= $fppflags \$(AMBERBUILDFLAGS)
 FPP= $fpp \$(FPPFLAGS)
 FC= $fc
-FFLAGS= $fflags \$(LOCALFLAGS) \$(AMBERBUILDFLAGS)
-FOPTFLAGS= $foptflags \$(LOCALFLAGS) \$(AMBERBUILDFLAGS)
+FFLAGS= $fflags \$(LOCALFLAGS) \$(AMBERBUILDFLAGS) $fortflag
+FOPTFLAGS= $foptflags \$(LOCALFLAGS) \$(AMBERBUILDFLAGS) $fortflag
 FPP_PREFIX= $fpp_prefix
 FREEFORMAT_FLAG= $freeformat_flag