diff --git a/sc2/configure.ac b/sc2/configure.ac
index 50d7f386f..34ce03b2a 100644
--- a/sc2/configure.ac
+++ b/sc2/configure.ac
@@ -73,8 +73,8 @@ AM_PATH_SMPEG($SMPEG_VERSION, , AC_MSG_ERROR([*** smpeg version $SMPEG_VERSION n
 AC_CHECK_LIB(SDL_mixer, main, , AC_MSG_ERROR([Your system is missing libSDL_mixer!]),`sdl-config --libs`)
 AC_CHECK_LIB(SDL_image, main, , AC_MSG_ERROR([Your system is missing libSDL_image!]),`sdl-config --libs`)
 AC_CHECK_LIB(smpeg, main, , AC_MSG_ERROR([Your system is missing libsmpeg!]),`smpeg-config --libs`)
-AC_CHECK_HEADERS(SDL/SDL_image.h, , AC_MSG_ERROR([Your system is missing SDL_image.h!]))
-AC_CHECK_HEADERS(SDL/SDL_mixer.h, , AC_MSG_ERROR([Your system is missing SDL_mixer.h!]))
+#AC_CHECK_HEADERS(SDL/SDL_image.h, , AC_MSG_ERROR([Your system is missing SDL_image.h!]))
+#AC_CHECK_HEADERS(SDL/SDL_mixer.h, , AC_MSG_ERROR([Your system is missing SDL_mixer.h!]))
 
 # Select platform dependent OpenGL libs.. (tweak your platform here)
 case "$target" in
@@ -91,6 +91,13 @@ case "$target" in
     *-*-darwin*)
         SYS_GL_LIBS=""
         ;;
+    *-*-freebsd*)
+        AC_PATH_X
+	if test x$no_x != xyes; then
+            CFLAGS="$CFLAGS -L $x_libraries"
+        fi
+	SYS_GL_LIBS="-lGL"
+	;;
     *)
         if test x$have_x = xyes; then
             CFLAGS="$CFLAGS $X_CFLAGS"
diff --git a/sc2/content/defgrp.dat b/sc2/content/defgrp.dat
index 00cb5c048..44dbe3962 100644
Binary files a/sc2/content/defgrp.dat and b/sc2/content/defgrp.dat differ
diff --git a/sc2/content/randgrp.dat b/sc2/content/randgrp.dat
index d52344b86..0d5bda659 100644
Binary files a/sc2/content/randgrp.dat and b/sc2/content/randgrp.dat differ
diff --git a/sc2/src/sc2code/libs/resource/direct.c b/sc2/src/sc2code/libs/resource/direct.c
index 759cad036..9f4cdec29 100644
--- a/sc2/src/sc2code/libs/resource/direct.c
+++ b/sc2/src/sc2code/libs/resource/direct.c
@@ -145,6 +145,7 @@ LoadDirEntryTable (PSTR pattern, PCOUNT pnum_entries)
 #include <unistd.h>
 #include <fnmatch.h>
 #include <ctype.h>
+#include <sys/param.h>
 
 DIRENTRY_REF
 LoadDirEntryTable (PSTR pattern, PCOUNT pnum_entries)
@@ -154,7 +155,7 @@ LoadDirEntryTable (PSTR pattern, PCOUNT pnum_entries)
 	STRING_TABLEPTR lpST;
 	PDWORD lpLastOffs;
 	PSTR slash;     // Pointer inside pattern to the last /
-	SBYTE path[PATH_MAX + 1];  // buffer for a filename with path
+	SBYTE path[MAXPATHLEN + 1];  // buffer for a filename with path
 	PSTR file;       // Pointer inside path to the filename
 	size_t pathlen;  // length of path, excluding last / and filename
 
diff --git a/sc2/src/sc2code/libs/threads/sdl/sdlthreads.c b/sc2/src/sc2code/libs/threads/sdl/sdlthreads.c
index 75b49b1c8..74ccb1f5d 100644
--- a/sc2/src/sc2code/libs/threads/sdl/sdlthreads.c
+++ b/sc2/src/sc2code/libs/threads/sdl/sdlthreads.c
@@ -20,8 +20,8 @@
 #include "sdlthreads.h"
 
 #if defined(PROFILE_THREADS) && !defined(WIN32)
-#include <sys/resource.h>
 #include <sys/time.h>
+#include <sys/resource.h>
 #endif
 
 #ifdef PROFILE_THREADS