diff --git a/build/config/Linux-SolarisStudio b/build/config/Linux-SolarisStudio
index fd4148090..ca0f6022d 100644
--- a/build/config/Linux-SolarisStudio
+++ b/build/config/Linux-SolarisStudio
@@ -18,7 +18,7 @@ LINKMODE ?= SHARED
 CC      = cc
 CXX     = CC
 LINK    = $(CXX)
-LIB     = $(CXX) -xar -o $@
+LIB     = $(CXX) -xar -o 
 RANLIB  = ranlib
 SHLIB   = $(CXX) $(LINKFLAGS) -G -o $@ -h$(notdir $@)
 SHLIBLN = $(POCO_BASE)/build/script/shlibln
@@ -41,10 +41,10 @@ SHAREDLIBLINKEXT = .so
 CFLAGS          = -mt
 CFLAGS32        =
 CFLAGS64        =
-CXXFLAGS        = -mt -std=c++11 -erroff=hidevf
+CXXFLAGS        = -mt -std=c++03 -erroff=hidevf
 CXXFLAGS32      =
 CXXFLAGS64      =
-LINKFLAGS       =
+LINKFLAGS       = -mt -std=c++03
 LINKFLAGS32     =
 LINKFLAGS64     =
 STATICOPT_CC    =
@@ -56,14 +56,14 @@ SHAREDOPT_LINK  = -Bdynamic
 DEBUGOPT_CC     = -g -D_DEBUG
 DEBUGOPT_CXX    = -g -D_DEBUG
 DEBUGOPT_LINK   = -g
-RELEASEOPT_CC   = -xO5 -DNDEBUG
-RELEASEOPT_CXX  = -xO5 -DNDEBUG
-RELEASEOPT_LINK = -xO5
+RELEASEOPT_CC   = -xO3 -DNDEBUG
+RELEASEOPT_CXX  = -xO3 -DNDEBUG
+RELEASEOPT_LINK = -xO3
 
 #
 # System Specific Flags
 #
-SYSFLAGS = -DPOCO_NO_GCC_API_ATTRIBUTE -DPOCO_NO_FPENVIRONMENT -D_XOPEN_SOURCE=500 -D_REENTRANT -D_THREAD_SAFE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -DPOCO_HAVE_FD_EPOLL
+SYSFLAGS = -DPOCO_NO_GCC_API_ATTRIBUTE -DPOCO_NO_FPENVIRONMENT -D_XOPEN_SOURCE=500 -D_REENTRANT -D_THREAD_SAFE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -DPOCO_NO_GCC_DIAG
 
 #
 # System Specific Libraries