diff --git a/Tools/Frame_params/Parrot_Disco.param b/Tools/Frame_params/Parrot_Disco/Parrot_Disco.param
similarity index 100%
rename from Tools/Frame_params/Parrot_Disco.param
rename to Tools/Frame_params/Parrot_Disco/Parrot_Disco.param
diff --git a/Tools/Frame_params/Parrot_Disco/README.md b/Tools/Frame_params/Parrot_Disco/README.md
new file mode 100644
index 0000000000..e040de6b20
--- /dev/null
+++ b/Tools/Frame_params/Parrot_Disco/README.md
@@ -0,0 +1,2 @@
+Please see http://ardupilot.org/plane/docs/airframe-disco.html for
+more information on setting up a Parrot Disco
diff --git a/Tools/Frame_params/Parrot_Disco/rcS_mode_default b/Tools/Frame_params/Parrot_Disco/rcS_mode_default
new file mode 100755
index 0000000000..e4866ded97
--- /dev/null
+++ b/Tools/Frame_params/Parrot_Disco/rcS_mode_default
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# default rcS running mode script
+
+echo $((1024*1024)) > /proc/sys/net/core/wmem_max	# inscrease the max socket size
+if test -x /data/ftp/internal_000/APM/start_ardupilot.sh; then
+  ulogger -t "rcS_mode_default" -p I "Launching ArduPilot"
+  /data/ftp/internal_000/APM/start_ardupilot.sh
+else
+  ulogger -t "rcS_mode_default" -p I "Launching Dragon"
+  DragonStarter.sh -out2null &
+fi
+sleep 1
+
diff --git a/Tools/Frame_params/Parrot_Disco/start_ardupilot.sh b/Tools/Frame_params/Parrot_Disco/start_ardupilot.sh
new file mode 100755
index 0000000000..261449fd03
--- /dev/null
+++ b/Tools/Frame_params/Parrot_Disco/start_ardupilot.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+cd /data/ftp/internal_000/APM
+(
+ date
+
+ # startup fan
+ echo 1 > /sys/devices/platform/user_gpio/FAN/value
+ 
+ while :; do
+    echo "$(date) Starting arduplane"
+   ./arduplane -A udp:192.168.42.255:14550:bcast -B /dev/ttyPA1 -C udp:192.168.43.255:14550:bcast --module-directory modules
+ done
+) >> start_ardupilot.log 2>&1 &
+
+
+