diff --git a/ROMFS/px4fmu_common/init.d/4013_bebop b/ROMFS/px4fmu_common/init.d/4013_bebop
new file mode 100644
index 0000000000000000000000000000000000000000..c870fbe10fb303071b6466e1a7707e7e3aa14ea1
--- /dev/null
+++ b/ROMFS/px4fmu_common/init.d/4013_bebop
@@ -0,0 +1,35 @@
+#!nsh
+#
+# @name Parrot Bebop Frame
+#
+# @type Quadrotor x
+#
+# @maintainer Michael Schaeuble
+#
+
+sh /etc/init.d/rc.mc_defaults
+
+#
+# Load default params for this platform
+#
+if [ $AUTOCNF == yes ]
+then
+    # Set all params here, then disable autoconfig
+    param set MC_ROLL_P 6.5
+    param set MC_ROLLRATE_P 0.109999999403953552
+    param set MC_ROLLRATE_I 0.0
+    param set MC_ROLLRATE_D 0.0006
+    param set MC_PITCH_P 6.5
+    param set MC_PITCHRATE_P 0.1
+    param set MC_PITCHRATE_I 0.0
+    param set MC_PITCHRATE_D 0.000799999
+    param set MC_YAW_P 1.049999
+    param set MC_YAWRATE_P 0.05
+    param set MC_YAWRATE_I 0.001
+    param set MC_YAWRATE_D 0.0
+    param set MC_YAW_FF 0.7
+fi
+
+set OUTPUT_MODE bebop
+set USE_IO no
+set MIXER bebop
diff --git a/ROMFS/px4fmu_common/mixers/bebop.main.mix b/ROMFS/px4fmu_common/mixers/bebop.main.mix
new file mode 100644
index 0000000000000000000000000000000000000000..2c64b385d2b86e0b243895d26b6b3b471715fbdb
--- /dev/null
+++ b/ROMFS/px4fmu_common/mixers/bebop.main.mix
@@ -0,0 +1,7 @@
+Multirotor mixer for Parrot Bebop
+=================================
+
+This file defines a single mixer for a quadrotor in the x configuration. All controls
+are mixed 100%.
+
+R: 4x 10000 10000 -10000 0
diff --git a/posix-configs/bebop/px4.config b/posix-configs/bebop/px4.config
index ed8e3a1266aba609ceeca0754efbb42ffb6dc980..00fff38e92f7d762d932aa64edf3cc26c3b183e2 100644
--- a/posix-configs/bebop/px4.config
+++ b/posix-configs/bebop/px4.config
@@ -1,9 +1,22 @@
 uorb start
 param select /home/root/parameters
 param load
-param set SYS_AUTOSTART 4001
+param set SYS_AUTOSTART 4013
 param set MAV_BROADCAST 1
 param set MAV_TYPE 3
+param set MC_ROLL_P 6.5
+param set MC_ROLLRATE_P 0.109999999403953552
+param set MC_ROLLRATE_I 0.0
+param set MC_ROLLRATE_D 0.0006
+param set MC_PITCH_P 6.5
+param set MC_PITCHRATE_P 0.1
+param set MC_PITCHRATE_I 0.0
+param set MC_PITCHRATE_D 0.000799999
+param set MC_YAW_P 1.049999
+param set MC_YAWRATE_P 0.05
+param set MC_YAWRATE_I 0.001
+param set MC_YAWRATE_D 0.0
+param set MC_YAW_FF 0.7
 #df_ms5607_wrapper start
 df_mpu6050_wrapper start -R 8
 df_ak8963_wrapper start -R 4