diff --git a/configure b/configure
index 0c579b3e747..7651e295ecc 100755
--- a/configure
+++ b/configure
@@ -2854,7 +2854,7 @@ if [ -z "$PLATFORM" ]; then
         PLATFORM=ultrix-g++
         ;;
      FreeBSD:*)
-        PLATFORM=freebsd-g++
+        PLATFORM=freebsd-clang
         PLATFORM_NOTES="
             - Also available for FreeBSD: freebsd-icc
         "
diff --git a/mkspecs/unsupported/freebsd-clang/qmake.conf b/mkspecs/freebsd-clang/qmake.conf
similarity index 91%
rename from mkspecs/unsupported/freebsd-clang/qmake.conf
rename to mkspecs/freebsd-clang/qmake.conf
index 9d9815a7b3b..7f18bbb7211 100644
--- a/mkspecs/unsupported/freebsd-clang/qmake.conf
+++ b/mkspecs/freebsd-clang/qmake.conf
@@ -30,7 +30,7 @@ QMAKE_OBJCOPY           = objcopy
 QMAKE_NM                = nm -P
 QMAKE_RANLIB            =
 
-include(../../common/gcc-base-unix.conf)
-include(../../common/clang.conf)
+include(../common/gcc-base-unix.conf)
+include(../common/clang.conf)
 
 load(qt_config)
diff --git a/mkspecs/freebsd-g++/qplatformdefs.h b/mkspecs/freebsd-clang/qplatformdefs.h
similarity index 100%
rename from mkspecs/freebsd-g++/qplatformdefs.h
rename to mkspecs/freebsd-clang/qplatformdefs.h
diff --git a/mkspecs/freebsd-g++/qmake.conf b/mkspecs/unsupported/freebsd-g++/qmake.conf
similarity index 87%
rename from mkspecs/freebsd-g++/qmake.conf
rename to mkspecs/unsupported/freebsd-g++/qmake.conf
index 282b6bdfa7c..527a94870c9 100644
--- a/mkspecs/freebsd-g++/qmake.conf
+++ b/mkspecs/unsupported/freebsd-g++/qmake.conf
@@ -5,7 +5,7 @@
 MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = freebsd bsd
 
-include(../common/unix.conf)
+include(../../common/unix.conf)
 
 QMAKE_CFLAGS_THREAD     = -pthread -D_THREAD_SAFE
 
@@ -29,6 +29,6 @@ QMAKE_OBJCOPY           = objcopy
 QMAKE_NM                = nm -P
 QMAKE_RANLIB            =
 
-include(../common/gcc-base-unix.conf)
-include(../common/g++-unix.conf)
+include(../../common/gcc-base-unix.conf)
+include(../../common/g++-unix.conf)
 load(qt_config)
diff --git a/mkspecs/unsupported/freebsd-clang/qplatformdefs.h b/mkspecs/unsupported/freebsd-g++/qplatformdefs.h
similarity index 97%
rename from mkspecs/unsupported/freebsd-clang/qplatformdefs.h
rename to mkspecs/unsupported/freebsd-g++/qplatformdefs.h
index 68a886ed897..b52be38b4ed 100644
--- a/mkspecs/unsupported/freebsd-clang/qplatformdefs.h
+++ b/mkspecs/unsupported/freebsd-g++/qplatformdefs.h
@@ -31,4 +31,4 @@
 **
 ****************************************************************************/
 
-#include "../../freebsd-g++/qplatformdefs.h"
+#include "../../freebsd-clang/qplatformdefs.h"
diff --git a/mkspecs/freebsd-g++46/qmake.conf b/mkspecs/unsupported/freebsd-g++46/qmake.conf
similarity index 90%
rename from mkspecs/freebsd-g++46/qmake.conf
rename to mkspecs/unsupported/freebsd-g++46/qmake.conf
index b930fca78b5..11041dee3d2 100644
--- a/mkspecs/freebsd-g++46/qmake.conf
+++ b/mkspecs/unsupported/freebsd-g++46/qmake.conf
@@ -5,7 +5,7 @@
 MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = freebsd bsd
 
-include(../common/unix.conf)
+include(../../common/unix.conf)
 
 QMAKE_CFLAGS_THREAD     = -pthread -D_THREAD_SAFE
 
@@ -29,8 +29,8 @@ QMAKE_OBJCOPY           = objcopy
 QMAKE_NM                = nm -P
 QMAKE_RANLIB            =
 
-include(../common/gcc-base-unix.conf)
-include(../common/g++-unix.conf)
+include(../../common/gcc-base-unix.conf)
+include(../../common/g++-unix.conf)
 
 # Redefined here because g++-base.conf sets QMAKE_CC and QMAKE_CXX
 # to gcc and g++, respectively.
diff --git a/mkspecs/freebsd-g++46/qplatformdefs.h b/mkspecs/unsupported/freebsd-g++46/qplatformdefs.h
similarity index 97%
rename from mkspecs/freebsd-g++46/qplatformdefs.h
rename to mkspecs/unsupported/freebsd-g++46/qplatformdefs.h
index 48dc4d64fb0..b52be38b4ed 100644
--- a/mkspecs/freebsd-g++46/qplatformdefs.h
+++ b/mkspecs/unsupported/freebsd-g++46/qplatformdefs.h
@@ -31,4 +31,4 @@
 **
 ****************************************************************************/
 
-#include "../freebsd-g++/qplatformdefs.h"
+#include "../../freebsd-clang/qplatformdefs.h"