diff --git a/README b/README
index 26753e26d..a85d13726 100644
--- a/README
+++ b/README
@@ -40,7 +40,7 @@ Remark: clang does not support OpenMP yet.
 
    autoconf
    ./configure CXX=clang++
-   python scripts/mk_make.py --noomp
+   python scripts/mk_make.py
    cd build
    make
 
diff --git a/configure.ac b/configure.ac
index 49431f500..f0314e7c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,7 +83,7 @@ fi
 ###################
 # Sets CXX
 AC_LANG([C++])
-AC_PROG_CXX(g++ false)
+AC_PROG_CXX(g++ clang++ false)
 AC_PROG_CC
 if test $CXX = "false"; then
    AC_MSG_ERROR([C++ compiler was not found])
@@ -99,8 +99,21 @@ AC_PROG_GREP
 # Sets SED
 AC_PROG_SED
 
-# Sets OPENMP_CFLAGS
-m4_ifdef([AC_OPENMP], [AC_OPENMP])
+AS_IF([test "$CXX" = "g++"], [
+   # Enable OpenMP
+   CXXFLAGS+=" -fopenmp"  
+   LDFLAGS+=" -fopenmp"
+   SLIBEXTRAFLAGS+=" -fopenmp"
+   # Use -mfpmath=sse
+   CXXFLAGS+=" -mfpmath=sse"
+],
+      [test "$CXX" = "clang++"], [
+   # OpenMP is not supported in clang++
+   CXXFLAGS+=" -D _NO_OMP_"  
+],
+[
+  AC_MSG_ERROR([Unsupported compiler: $CXX])
+])
 
 AR=ar
 AC_SUBST(AR)
@@ -115,30 +128,25 @@ host_os=`uname -s`
 AS_IF([test "$host_os" = "Darwin"], [
   PLATFORM=osx
   SO_EXT=.dylib
-  LDFLAGS=
-  SLIBFLAGS="-dynamiclib"
-  SLIBEXTRAFLAGS=""
+  SLIBFLAGS+="-dynamiclib"
   COMP_VERSIONS="-compatibility_version \$(Z3_VERSION) -current_version \$(Z3_VERSION)"
   STATIC_FLAGS=
 ], [test "$host_os" = "Linux"], [
   PLATFORM=linux
   SO_EXT=.so
-  LDFLAGS=-lrt
-  SLIBFLAGS="-shared"
-  SLIBEXTRAFLAGS=
+  SLIBFLAGS+="-shared"
   COMP_VERSIONS=
   STATIC_FLAGS=-static
   CXXFLAGS+=" -fno-strict-aliasing"
   if test "$CXX" = "clang++"; then
+     # More flags for clang++ for Linux
      CXXFLAGS+=" -Wno-unknown-pragmas -Wno-overloaded-virtual -Wno-unused-value"
-     SLIBEXTRAFLAGS+=" -lrt"
   fi
+  SLIBEXTRAFLAGS+=" -lrt"
 ], [test "${host_os:0:6}" = "CYGWIN"], [
    PLATFORM=win
    SO_EXT=.dll
-   LDFLAGS=
-   SLIBFLAGS="-shared"
-   SLIBEXTRAFLAGS=
+   SLIBFLAGS+="-shared"
    COMP_VERSIONS=
    CXXFLAGS+=" -D_CYGWIN -fno-strict-aliasing"
 ],
@@ -146,11 +154,6 @@ AS_IF([test "$host_os" = "Darwin"], [
   AC_MSG_ERROR([Unknown host platform: $host_os])
 ])
 
-# Only add -mfpmath=sse if g++
-if test "$CXX" = "g++"; then
-   CXXFLAGS+=" -mfpmath=sse"
-fi
-
 AC_SUBST(SLIBFLAGS)
 AC_SUBST(LDFLAGS)
 AC_SUBST(SLIBEXTRAFLAGS)
@@ -189,22 +192,18 @@ AC_OUTPUT(scripts/config-debug.mk scripts/config-release.mk)
 #
 ###################
 
-MKMAKE_OPT=
-if test "$CXX" = "clang++"; then
-   MKMAKE_OPT="--noomp"
-fi
-
 # Python is available, give user the option to generate the make files wherever they want
 cat <<EOF
 Z3 was configured with success.
 Host platform:  $PLATFORM
+Compiler:       $CXX
 Arithmetic:     $ARITH
 Python:         $PYTHON 
 Prefix:         $prefix
 64-bit:         $IS_X64
 
 To build and install Z3, execute:
-   python scripts/mk_make.py $MKMAKE_OPT
+   python scripts/mk_make.py
    cd build
    make
    sudo make install
diff --git a/scripts/config-vs-debug-x64.mk b/scripts/config-vs-debug-x64.mk
index d5654292a..0d0425749 100644
--- a/scripts/config-vs-debug-x64.mk
+++ b/scripts/config-vs-debug-x64.mk
@@ -1,6 +1,6 @@
 CC=cl
 CXX=cl
-CXXFLAGS=/c /Zi /nologo /W3 /WX- /Od /Oy- /D WIN32 /D _AMD64_ /D _DEBUG /D Z3DEBUG /D _CONSOLE /D _TRACE /D _WINDOWS /Gm /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Gd /analyze- 
+CXXFLAGS=/c /Zi /nologo /openmp /W3 /WX- /Od /Oy- /D WIN32 /D _AMD64_ /D _DEBUG /D Z3DEBUG /D _CONSOLE /D _TRACE /D _WINDOWS /Gm /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Gd /analyze- 
 CXX_OUT_FLAG=/Fo
 OBJ_EXT=.obj
 LIB_EXT=.lib
diff --git a/scripts/config-vs-debug.mk b/scripts/config-vs-debug.mk
index 8733e2ffb..ba4312c46 100644
--- a/scripts/config-vs-debug.mk
+++ b/scripts/config-vs-debug.mk
@@ -1,6 +1,6 @@
 CC=cl
 CXX=cl
-CXXFLAGS=/c /Zi /nologo /W3 /WX- /Od /Oy- /D WIN32 /D _DEBUG /D Z3DEBUG /D _CONSOLE /D _TRACE /D _WINDOWS /Gm /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Gd /analyze- /arch:SSE2
+CXXFLAGS=/c /Zi /nologo /openmp /W3 /WX- /Od /Oy- /D WIN32 /D _DEBUG /D Z3DEBUG /D _CONSOLE /D _TRACE /D _WINDOWS /Gm /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Gd /analyze- /arch:SSE2
 CXX_OUT_FLAG=/Fo
 OBJ_EXT=.obj
 LIB_EXT=.lib
diff --git a/scripts/config-vs-release-x64.mk b/scripts/config-vs-release-x64.mk
index 6cd264b32..983d93799 100644
--- a/scripts/config-vs-release-x64.mk
+++ b/scripts/config-vs-release-x64.mk
@@ -1,6 +1,6 @@
 CC=cl
 CXX=cl
-CXXFLAGS=/c /Zi /nologo /W3 /WX- /O2 /D _EXTERNAL_RELEASE /D WIN32 /D NDEBUG /D _LIB /D _WINDOWS /D _AMD64_ /D _UNICODE /D UNICODE /Gm- /EHsc /MD /GS /fp:precise /Zc:wchar_t /Zc:forScope /Gd /TP 
+CXXFLAGS=/c /Zi /nologo /openmp /W3 /WX- /O2 /D _EXTERNAL_RELEASE /D WIN32 /D NDEBUG /D _LIB /D _WINDOWS /D _AMD64_ /D _UNICODE /D UNICODE /Gm- /EHsc /MD /GS /fp:precise /Zc:wchar_t /Zc:forScope /Gd /TP 
 CXX_OUT_FLAG=/Fo
 OBJ_EXT=.obj
 LIB_EXT=.lib
diff --git a/scripts/config-vs-release.mk b/scripts/config-vs-release.mk
index 0257d87dc..bb43ef9f8 100644
--- a/scripts/config-vs-release.mk
+++ b/scripts/config-vs-release.mk
@@ -1,6 +1,6 @@
 CC=cl
 CXX=cl
-CXXFLAGS=/nologo /c /Zi /W3 /WX- /O2 /Oy- /D _EXTERNAL_RELEASE /D WIN32 /D NDEBUG /D _CONSOLE /D _WINDOWS /D ASYNC_COMMANDS /Gm- /EHsc /MD /GS /fp:precise /Zc:wchar_t /Zc:forScope /Gd /analyze- /arch:SSE2
+CXXFLAGS=/nologo /c /Zi /openmp /W3 /WX- /O2 /Oy- /D _EXTERNAL_RELEASE /D WIN32 /D NDEBUG /D _CONSOLE /D _WINDOWS /D ASYNC_COMMANDS /Gm- /EHsc /MD /GS /fp:precise /Zc:wchar_t /Zc:forScope /Gd /analyze- /arch:SSE2
 CXX_OUT_FLAG=/Fo
 OBJ_EXT=.obj
 LIB_EXT=.lib
diff --git a/scripts/mk_util.py b/scripts/mk_util.py
index 8068fb810..54f1931e5 100644
--- a/scripts/mk_util.py
+++ b/scripts/mk_util.py
@@ -40,7 +40,6 @@ Z3PY_SRC_DIR=None
 VS_PROJ = False
 TRACE = False
 DOTNET_ENABLED=False
-OMP = True
 
 VER_MAJOR=None
 VER_MINOR=None
@@ -121,12 +120,11 @@ def display_help():
     print "  -v, --vsproj                  generate Visual Studio Project Files."
     print "  -t, --trace                   enable tracing in release mode."
     print "  -n, --nodotnet                do not generate Microsoft.Z3.dll make rules."
-    print "  --noomp                       disable support for openmp."
     exit(0)
 
 # Parse configuration option for mk_make script
 def parse_options():
-    global VERBOSE, DEBUG_MODE, IS_WINDOWS, VS_X64, ONLY_MAKEFILES, SHOW_CPPS, VS_PROJ, TRACE, DOTNET_ENABLED, OMP
+    global VERBOSE, DEBUG_MODE, IS_WINDOWS, VS_X64, ONLY_MAKEFILES, SHOW_CPPS, VS_PROJ, TRACE, DOTNET_ENABLED
     options, remainder = getopt.gnu_getopt(sys.argv[1:], 'b:dsxhmcvtn', ['build=', 
                                                                          'debug',
                                                                          'silent',
@@ -136,8 +134,7 @@ def parse_options():
                                                                          'showcpp',
                                                                          'vsproj',
                                                                          'trace',
-                                                                         'nodotnet',
-                                                                         'noomp'
+                                                                         'nodotnet'
                                                                          ])
     for opt, arg in options:
         if opt in ('-b', '--build'):
@@ -164,8 +161,6 @@ def parse_options():
             TRACE = True
         elif opt in ('-n', '--nodotnet'):
             DOTNET_ENABLED = False
-        elif opt in ('--noomp'):
-            OMP = False
         else:
             raise MKException("Invalid command line option '%s'" % opt)
         
@@ -347,17 +342,6 @@ class Component:
                 extra_opt = '/D _TRACE'
             else:
                 extra_opt = '-D _TRACE'
-        if not OMP:
-            if IS_WINDOWS:
-                extra_opt = '%s /D _NO_OMP_' % extra_opt
-            else:
-                extra_opt = '%s -D _NO_OMP_' % extra_opt
-        else:
-            if IS_WINDOWS:
-                extra_opt = '%s /openmp' % extra_opt
-            else:
-                extra_opt = '%s -fopenmp' % extra_opt
-            
         out.write('\t@$(CXX) $(CXXFLAGS) %s $(%s) $(CXX_OUT_FLAG)%s %s\n' % (extra_opt, include_defs, objfile, srcfile))
 
     def mk_makefile(self, out):
@@ -492,10 +476,7 @@ class ExeComponent(Component):
         for dep in deps:
             c_dep = get_component(dep)
             out.write(' %s/%s$(LIB_EXT)' % (c_dep.build_dir, c_dep.name))
-        extra_flags = ''
-        if OMP and not IS_WINDOWS:
-            extra_flags = '-fopenmp'
-        out.write(' $(LINK_EXTRA_FLAGS) %s\n' % extra_flags)
+        out.write(' $(LINK_EXTRA_FLAGS)\n')
         out.write('%s: %s\n\n' % (self.name, exefile))
 
     def require_install_tactics(self):
@@ -571,10 +552,7 @@ class DLLComponent(Component):
             if not dep in self.reexports:
                 c_dep = get_component(dep)
                 out.write(' %s/%s$(LIB_EXT)' % (c_dep.build_dir, c_dep.name))
-        extra_flags= ''
-        if OMP and not IS_WINDOWS:
-            extra_flags = '-fopenmp'
-        out.write(' $(SLINK_EXTRA_FLAGS) %s' % extra_flags)
+        out.write(' $(SLINK_EXTRA_FLAGS)')
         if IS_WINDOWS:
             out.write(' /DEF:%s/%s.def' % (self.to_src_dir, self.name))
         out.write('\n')
@@ -701,10 +679,7 @@ class CppExampleComponent(ExampleComponent):
             out.write('%s.lib' % dll_name)
         else:
             out.write(dll)
-        extra_flags = ''
-        if OMP and not IS_WINDOWS:
-            extra_flags = '-fopenmp'
-        out.write(' $(LINK_EXTRA_FLAGS) %s\n' % extra_flags)
+        out.write(' $(LINK_EXTRA_FLAGS)\n')
         out.write('_ex_%s: %s\n\n' % (self.name, exefile))
 
 class CExampleComponent(CppExampleComponent):