diff --git a/Makefile b/Makefile
index d44b1b8b6b04779eecc999505c0211f37c3343d4..b2e0eb169b10759b06277aac73f5be66cdcf0262 100644
--- a/Makefile
+++ b/Makefile
@@ -82,6 +82,7 @@ SUBDIR+=	pr2-pick-object
 SUBDIR+= 	py-flann
 SUBDIR+= 	py-hla
 SUBDIR+= 	py-laaswm
+SUBDIR+= 	py-mavlink
 SUBDIR+= 	py-morse
 SUBDIR+=	rednav-genom
 SUBDIR+=	rfid-genom
diff --git a/py-mavlink/DESCR b/py-mavlink/DESCR
new file mode 100644
index 0000000000000000000000000000000000000000..c004c129e9452523082de825f3c98edcc9cc67c9
--- /dev/null
+++ b/py-mavlink/DESCR
@@ -0,0 +1,7 @@
+MAVLink -- Micro Air Vehicle Message Marshalling Library.
+
+This is a library for lightweight communication between Micro Air Vehicles
+(swarm) and/or ground control stations. It serializes C-structs for serial
+channels and can be used with any type of radio modem.
+
+This package contains the python interface.
diff --git a/py-mavlink/Makefile b/py-mavlink/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..41330977eea75330fc46a7d184384005aca8f0d0
--- /dev/null
+++ b/py-mavlink/Makefile
@@ -0,0 +1,39 @@
+# robotpkg Makefile for:	net/py27-mavlink
+# Created:			Arnaud Degroote on Fri, 30 Jan 2015
+#
+
+PKGNAME= 		${PKGTAG.python}-mavlink-${VERSION}
+DISTNAME=		${VERSION}
+VERSION=		1.0.11
+CATEGORIES=		net
+MASTER_SITES=		https://github.com/mavlink/mavlink/archive/
+MASTER_REPOSITORY=	https://github.com/mavlink/mavlink.git
+
+MAINTAINER=		arnaud.degroote@isae-supaero.fr
+COMMENT=		MAVLink -- Micro Air Vehicle Message Marshalling Library -- python interface
+LICENSE=		gnu-lgpl-v3
+
+WRKSRC= 		${WRKDIR}/mavlink-${VERSION}
+
+# XXX The generated / installed stuff seems to be python3 compatible but the
+# code generator used to generate it used really old library, only working with
+# python2
+DEPEND_ABI.python= 		python>=2.5<3
+
+CMAKE_ARG_PATH=		..
+CONFIGURE_DIRS=		_build
+INSTALLATION_DIRS= 	${PYTHON_SITELIB}/pymavlink
+
+pre-configure:
+	mkdir -p ${WRKSRC}/${CONFIGURE_DIRS}
+
+_installdir=${PREFIX}/${PYTHON_SITELIB}/pymavlink
+do-install:
+	cd ${WRKSRC}/${CONFIGURE_DIRS}/pymavlink/pymavlink && ${PAX} -rwp ma *.py ${_installdir}
+post-install: python-compile-all(${_installdir})
+
+
+include ../../mk/sysdep/cmake.mk
+include ../../mk/language/c.mk
+include ../../mk/sysdep/python.mk
+include ../../mk/robotpkg.mk
diff --git a/py-mavlink/PLIST b/py-mavlink/PLIST
new file mode 100644
index 0000000000000000000000000000000000000000..0a1f5c816ac68b77f31c7b49b8da8731a9167fd1
--- /dev/null
+++ b/py-mavlink/PLIST
@@ -0,0 +1,24 @@
+@comment Fri Jan 30 15:35:46 CET 2015
+${PYTHON_SITELIB}/pymavlink/__init__.py
+${PYTHON_SITELIB}/pymavlink/fgFDM.py
+${PYTHON_SITELIB}/pymavlink/mavextra.py
+${PYTHON_SITELIB}/pymavlink/mavlinkv09_ardupilotmega.py
+${PYTHON_SITELIB}/pymavlink/mavlinkv09_common.py
+${PYTHON_SITELIB}/pymavlink/mavlinkv09_minimal.py
+${PYTHON_SITELIB}/pymavlink/mavlinkv09_pixhawk.py
+${PYTHON_SITELIB}/pymavlink/mavlinkv09_slugs.py
+${PYTHON_SITELIB}/pymavlink/mavlinkv09_test.py
+${PYTHON_SITELIB}/pymavlink/mavlinkv09_ualberta.py
+${PYTHON_SITELIB}/pymavlink/mavlinkv10_ardupilotmega.py
+${PYTHON_SITELIB}/pymavlink/mavlinkv10_common.py
+${PYTHON_SITELIB}/pymavlink/mavlinkv10_matrixpilot.py
+${PYTHON_SITELIB}/pymavlink/mavlinkv10_minimal.py
+${PYTHON_SITELIB}/pymavlink/mavlinkv10_pixhawk.py
+${PYTHON_SITELIB}/pymavlink/mavlinkv10_sensesoar.py
+${PYTHON_SITELIB}/pymavlink/mavlinkv10_slugs.py
+${PYTHON_SITELIB}/pymavlink/mavlinkv10_test.py
+${PYTHON_SITELIB}/pymavlink/mavlinkv10_ualberta.py
+${PYTHON_SITELIB}/pymavlink/mavparm.py
+${PYTHON_SITELIB}/pymavlink/mavutil.py
+${PYTHON_SITELIB}/pymavlink/mavwp.py
+${PYTHON_SITELIB}/pymavlink/scanwin32.py
diff --git a/py-mavlink/depend.mk b/py-mavlink/depend.mk
new file mode 100644
index 0000000000000000000000000000000000000000..e80af5080d35bc2a6fcdca0691217c72cb26cd90
--- /dev/null
+++ b/py-mavlink/depend.mk
@@ -0,0 +1,28 @@
+# robotpkg depend.mk for:	net/py27-mavlink
+# Created:			Arnaud Degroote on Fri, 30 Jan 2015
+#
+
+DEPEND_DEPTH:=		${DEPEND_DEPTH}+
+PY_MAVLINK_DEPEND_MK:=${PY_MAVLINK_DEPEND_MK}+
+
+ifeq (+,$(DEPEND_DEPTH))
+DEPEND_PKG+=		py-mavlink
+endif
+
+ifeq (+,$(PY_MAVLINK_DEPEND_MK))
+PREFER.py-mavlink?=	robotpkg
+
+DEPEND_USE+=		py-mavlink
+
+DEPEND_ABI.py-mavlink?=	py-mavlink>=1.0.11
+DEPEND_DIR.py-mavlink?=	../../wip/py-mavlink
+
+SYSTEM_SEARCH.mavlink=\
+	'${PYTHON_SYSLIBSEARCH}/pymavlink/__init__.py'
+
+include ../../wip/mavlink/depend.mk
+include ../../mk/sysdep/python.mk
+
+endif
+
+DEPEND_DEPTH:=		${DEPEND_DEPTH:+=}
diff --git a/py-mavlink/distinfo b/py-mavlink/distinfo
new file mode 100644
index 0000000000000000000000000000000000000000..69b89404404316201dfe78ee1c33c5b7750ec025
--- /dev/null
+++ b/py-mavlink/distinfo
@@ -0,0 +1,3 @@
+SHA1 (1.0.11.tar.gz) = e6cbf1499cb6bea9cb67a566216aec68bd149b2d
+RMD160 (1.0.11.tar.gz) = 20aedd017e6d70fcd4d8a980dddadc7ad4902c55
+Size (1.0.11.tar.gz) = 374075 bytes