diff --git a/stella/configure b/stella/configure
index 282472d6d..cf8ad8358 100755
--- a/stella/configure
+++ b/stella/configure
@@ -66,9 +66,9 @@ cc_check() {
 	echo >> "$TMPLOG"
 	cat "$TMPC" >> "$TMPLOG"
 	echo >> "$TMPLOG"
-	echo "$CXX $TMPC -o $TMPO $@" >> "$TMPLOG"
+	echo "$CXX $TMPC -o $TMPO$EXEEXT $@" >> "$TMPLOG"
 	rm -f "$TMPO$EXEEXT"
-	( $CXX "$TMPC" -o "$TMPO" "$@" ) >> "$TMPLOG" 2>&1
+	( $CXX "$TMPC" -o "$TMPO$EXEEXT" "$@" ) >> "$TMPLOG" 2>&1
 	TMP="$?"
 	echo >> "$TMPLOG"
 	return "$TMP"
@@ -97,9 +97,9 @@ EOF
 
 if test -n "$_host"; then
 	# In cross-compiling mode, we cannot run the result
-	eval "$1 -o tmp_cxx_compiler tmp_cxx_compiler.cpp 2> /dev/null" && rm -f tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp
+	eval "$1 -o tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp 2> /dev/null" && rm -f tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp
 else
-	eval "$1 -o tmp_cxx_compiler tmp_cxx_compiler.cpp 2> /dev/null" && eval "./tmp_cxx_compiler 2> /dev/null" && rm -f tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp
+	eval "$1 -o tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp 2> /dev/null" && eval "./tmp_cxx_compiler 2> /dev/null" && rm -f tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp
 fi
 }
 
@@ -113,9 +113,11 @@ find_sdlconfig()
 	sdlconfigs="$_sdlconfig:sdl-config:sdl11-config:sdl12-config"
 	_sdlconfig=
 	
-	IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+	IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS="$SEPARATOR"
 	done=0
 	for path_dir in $_sdlpath; do
+                #reset separator to parse sdlconfigs
+                IFS=":"
 		for sdlconfig in $sdlconfigs; do
 			if test -x "$path_dir/$sdlconfig" ; then
 				_sdlconfig="$path_dir/$sdlconfig"
@@ -394,7 +396,7 @@ esac
 # Determine extension used for executables
 #
 case $_host_os in
-mingw* | cygwin*)
+mingw* | cygwin* |os2-emx*)
 	EXEEXT=".exe"
 	;;
 arm-riscos-aof)
@@ -408,6 +410,19 @@ psp)
 	;;
 esac
 
+#
+# Determine separator used for $PATH
+#
+case $_host_os in
+os2-emx* )
+        SEPARATOR=";"
+        ;;
+* )
+        SEPARATOR=":"
+        ;;
+esac
+
+
 #
 # Determine the C++ compiler
 #
@@ -557,6 +572,11 @@ else
 			LIBS="$LIBS -mno-cygwin -lmingw32 -lwinmm"
 			_host_os=win32
 			;;
+		os2*)
+			DEFINES="$DEFINES -DUNIX -DOS2"
+                        LIBS="$LIBS -lpng -lz"
+			_host_os=unix
+			;;
 		# given this is a shell script assume some type of unix
 		*)
 			echo "WARNING: could not establish system type, assuming unix like"