diff --git a/.gitmodules b/.gitmodules
index b00faff35..80f3512fe 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "src/xswiftbus/libxplanemp"]
 	path = src/xswiftbus/libxplanemp
 	url = git@github.com:swift-project/libxplanemp.git
+[submodule "src/xswiftbus/xplanemp2"]
+	path = src/xswiftbus/xplanemp2
+	url = git@github.com:swift-project/xplanemp2.git
diff --git a/docs/Doxyfile.qmake b/docs/Doxyfile.qmake
index 5fa573ee2..ee66096ce 100644
--- a/docs/Doxyfile.qmake
+++ b/docs/Doxyfile.qmake
@@ -802,7 +802,7 @@ RECURSIVE              = YES
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
-EXCLUDE                 = $(DOXY_SRC_ROOT)/src/xswiftbus/libxplanemp \
+EXCLUDE                 = $(DOXY_SRC_ROOT)/src/xswiftbus/xplanemp2 \
                           $(DOXY_SRC_ROOT)/src/plugins/simulator/fsuipc32 \
                           $(DOXY_SRC_ROOT)/src/plugins/simulator/fsuipc64 \
                           $(DOXY_SRC_ROOT)/src/plugins/weatherdata/gfs/g2clib
diff --git a/src/xswiftbus/xplanemp2 b/src/xswiftbus/xplanemp2
new file mode 160000
index 000000000..71b339f88
--- /dev/null
+++ b/src/xswiftbus/xplanemp2
@@ -0,0 +1 @@
+Subproject commit 71b339f88c1f1675d9e71a0754e17d7d44afe65a
diff --git a/src/xswiftbus/xswiftbus.pro b/src/xswiftbus/xswiftbus.pro
index fc48abd05..e715b5182 100644
--- a/src/xswiftbus/xswiftbus.pro
+++ b/src/xswiftbus/xswiftbus.pro
@@ -36,9 +36,9 @@ SOURCES += $$files($$PWD/*.cpp)
 HEADERS += $$files($$PWD/*.h)
 
 # Using the $$files function so we can remove some with -= below
-SOURCES += $$files(libxplanemp/src/*.cpp)
-HEADERS += $$files(libxplanemp/src/*.h) $$files(libxplanemp/include/*.h)
-INCLUDEPATH += ./libxplanemp ./libxplanemp/include ./libxplanemp/src
+SOURCES += $$files(xplanemp2/src/*.cpp)
+HEADERS += $$files(xplanemp2/src/*.h) $$files(xplanemp2/include/*.h)
+INCLUDEPATH += ./xplanemp2 ./xplanemp2/include ./xplanemp2/src
 
 unix:!macx {
     INCLUDEPATH *= /usr/include/dbus-1.0
@@ -50,10 +50,10 @@ unix:!macx {
 }
 
 # PlatformUtils also not used
-SOURCES -= $$files(libxplanemp/src/PlatformUtils.*.cpp)
-HEADERS -= libxplanemp/src/PlatformUtils.h
+SOURCES -= $$files(xplanemp2/src/PlatformUtils.*.cpp)
+HEADERS -= xplanemp2/src/PlatformUtils.h
 
-# Externals required by libxplanemp
+# Externals required by xplanemp2
 CONFIG += opengl
 msvc {
     CONFIG(debug, debug|release): LIBS += -lpngd -lzd -lopengl32 -lglu32
@@ -64,17 +64,15 @@ else: LIBS += -lpng -lz
 
 msvc: DEFINES += _CRT_SECURE_NO_WARNINGS
 
-# Required by X-Plane SDK and libxplanemp
+# Required by X-Plane SDK and xplanemp2
 win32:DEFINES += IBM=1
 linux:DEFINES += LIN=1
 macx:DEFINES += APL=1
 DEFINES += XPLM200=1
-# XPLM210 is required for new features in libxplanemp,
-# but means we lose support for X-Plane 9 and earlier versions.
-# TODO add config option to select minimum X-Plane version when building
 DEFINES += XPLM210=1
+DEFINES += XPLM300=1
 
-# Name will be used in libxplanemp log messages
+# Name will be used in xplanemp2 log messages
 DEFINES += XPMP_CLIENT_NAME=\\\"xswiftbus\\\"
 DEFINES += XPMP_CLIENT_LONGNAME=\\\"xswiftbus\\\"