diff --git a/misc/joysticks/engine.cfg b/misc/joysticks/engine.cfg
new file mode 100644
index 00000000..71ac9100
--- /dev/null
+++ b/misc/joysticks/engine.cfg
@@ -0,0 +1,10 @@
+[application]
+
+name="Joysticks"
+main_scene="res://joysticks.scn"
+icon="res://icon.png"
+
+[display]
+
+width=260
+height=300
diff --git a/misc/joysticks/icon.png b/misc/joysticks/icon.png
new file mode 100644
index 00000000..06b0d753
Binary files /dev/null and b/misc/joysticks/icon.png differ
diff --git a/misc/joysticks/joysticks.gd b/misc/joysticks/joysticks.gd
new file mode 100644
index 00000000..d359e993
--- /dev/null
+++ b/misc/joysticks/joysticks.gd
@@ -0,0 +1,40 @@
+
+extends Node2D
+
+# Joysticks demo, written by Dana Olson <dana@shineuponthee.com>
+#
+# This is a demo of joystick support, and doubles as a testing application
+# inspired by and similar to jstest-gtk.
+#
+# Licensed under the MIT license
+
+var joy_num
+var cur_joy
+var axis_value
+var btn_state
+
+func _ready():
+	set_process_input(true)
+
+func _input(ev):
+	# get the joystick device number from the spinbox
+	joy_num = get_node("joy_num").get_value()
+	
+	# display the name of the joystick if we haven't already
+	if joy_num != cur_joy:
+		cur_joy = joy_num
+		get_node("joy_name").set_text( Input.get_joy_name(joy_num) )
+	
+	# loop through the axes and show their current values
+	for axis in range(0,8):
+		axis_value = Input.get_joy_axis(joy_num,axis)
+		get_node("axis_prog"+str(axis)).set_value(100*axis_value)
+		get_node("axis_val"+str(axis)).set_text(str(axis_value))
+	
+	# loop through the buttons and highlight the ones that are pressed
+	for btn in range(0,17):
+		btn_state = 1
+		if (Input.is_joy_button_pressed(joy_num, btn)):
+			get_node("btn"+str(btn)).add_color_override("font_color",Color(1,1,1,1))
+		else:
+			get_node("btn"+str(btn)).add_color_override("font_color",Color(0.2,0.1,0.3,1))
diff --git a/misc/joysticks/joysticks.scn b/misc/joysticks/joysticks.scn
new file mode 100644
index 00000000..5dbd7f49
Binary files /dev/null and b/misc/joysticks/joysticks.scn differ