diff --git a/Makefile b/Makefile
index 5b984c8dd6932b94cf518e9ed34ea92c829a7cd7..ad7f9a53bf19d015d526c06ec9fc2d5221f31008 100644
--- a/Makefile
+++ b/Makefile
@@ -52,6 +52,7 @@ SUBDIR+= 	mavlink
 SUBDIR+=	metapod
 SUBDIR+=	mhp-genom
 SUBDIR+=	morse-hla
+SUBDIR+=	morse-mavlink
 SUBDIR+=	morse-pocolibs
 SUBDIR+=	morse-ros
 SUBDIR+=	move3d-assets
diff --git a/morse-mavlink/DESCR b/morse-mavlink/DESCR
new file mode 100644
index 0000000000000000000000000000000000000000..ba37b62e123aee3939d58458fba06c4067af77de
--- /dev/null
+++ b/morse-mavlink/DESCR
@@ -0,0 +1,2 @@
+MAVLINK (Micro Air Vehicle Message Marshalling Library) bindings for the MORSE
+simulator
diff --git a/morse-mavlink/Makefile b/morse-mavlink/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..d9a5fe85572fd21cc503264199202236d8e72517
--- /dev/null
+++ b/morse-mavlink/Makefile
@@ -0,0 +1,23 @@
+# robotpkg Makefile for:	simulation/morse-mavlink
+# Created:			Arnaud Degroote on Mon,  8 Feb 2016
+#
+
+PKGNAME=		morse-mavlink-${MORSE_VERSION}
+
+include ../../simulation/morse/Makefile.common
+
+COMMENT+=		(mavlink bindings)
+
+CMAKE_ARGS+=		-DBUILD_CORE_SUPPORT=OFF
+CMAKE_ARGS+=		-DBUILD_DOC_SUPPORT=OFF
+
+CMAKE_ARGS+=		-DBUILD_MAVLINK_SUPPORT=ON
+CMAKE_ARGS+=		-DBUILD_MOOS_SUPPORT=OFF
+CMAKE_ARGS+=		-DBUILD_HLA_SUPPORT=OFF
+CMAKE_ARGS+=		-DBUILD_ROS_SUPPORT=OFF
+CMAKE_ARGS+=		-DBUILD_YARP_SUPPORT=OFF
+CMAKE_ARGS+= 		-DPYMORSE_SUPPORT=OFF
+
+include ../../simulation/morse/depend.mk
+include ../../wip/py-mavlink/depend.mk
+include ../../mk/robotpkg.mk
diff --git a/morse-mavlink/PLIST b/morse-mavlink/PLIST
new file mode 100644
index 0000000000000000000000000000000000000000..a167793eeca4d114f5024e7bcadd95a0cfeb484f
--- /dev/null
+++ b/morse-mavlink/PLIST
@@ -0,0 +1,8 @@
+@comment Mon Feb 8 10:38:03 CET 2016
+${PYTHON_SITELIB}/morse/middleware/mavlink/__init__.py
+${PYTHON_SITELIB}/morse/middleware/mavlink/abstract_mavlink.py
+${PYTHON_SITELIB}/morse/middleware/mavlink/attitude.py
+${PYTHON_SITELIB}/morse/middleware/mavlink/local_position_ned_to_waypoint.py
+${PYTHON_SITELIB}/morse/middleware/mavlink/odometry_to_local_ned.py
+${PYTHON_SITELIB}/morse/middleware/mavlink/read_attitude_target.py
+${PYTHON_SITELIB}/morse/middleware/mavlink_datastream.py
diff --git a/morse-mavlink/depend.mk b/morse-mavlink/depend.mk
new file mode 100644
index 0000000000000000000000000000000000000000..4f75ff1ad380bc3701a3640f1d572282a1a4680c
--- /dev/null
+++ b/morse-mavlink/depend.mk
@@ -0,0 +1,28 @@
+# robotpkg depend.mk for:	simulation/morse-mavlink
+# Created:			Arnaud Degroote on Mon,  8 Feb 2016
+#
+
+DEPEND_DEPTH:=			${DEPEND_DEPTH}+
+MORSE_MAVLINK_DEPEND_MK:=	${MORSE_MAVLINK_DEPEND_MK}+
+
+ifeq (+,$(DEPEND_DEPTH))
+DEPEND_PKG+=			morse-mavlink
+endif
+
+ifeq (+,$(MORSE_MAVLINK_DEPEND_MK)) # -------------------------------------
+
+PREFER.morse-mavlink?=		robotpkg
+
+DEPEND_USE+=		morse-mavlink
+
+DEPEND_ABI.morse-mavlink?=	morse-mavlink>=1.0
+DEPEND_DIR.morse-mavlink?=	../../wip/morse-mavlink
+
+SYSTEM_SEARCH.morse-mavlink=\
+	lib/python*/{site,dist}-packages/morse/multinode/mavlink.py
+
+include ../../mk/sysdep/python.mk
+
+endif # MORSE_MAVLINK_DEPEND_MK -------------------------------------------
+
+DEPEND_DEPTH:=		${DEPEND_DEPTH:+=}