diff --git a/wadsrc/static/engine/commonbinds.txt b/wadsrc/static/engine/commonbinds.txt
index 8c5ee403ac..0cb5756cc2 100644
--- a/wadsrc/static/engine/commonbinds.txt
+++ b/wadsrc/static/engine/commonbinds.txt
@@ -65,6 +65,20 @@ pad_start menu_main
 pad_back pause
 lthumb crouch
 
+// Generic gamepad bindings
+joy1 +use
+joy4 +jump
+axis6plus +attack
+axis3plus +altattack
+joy5 weapprev
+joy6 weapnext
+pov1left invprev
+pov1right invnext
+pov1down invuse
+pov1up togglemap
+joy8 menu_main
+joy7 pause
+joy10 crouch
 
 /* Default automap bindings */
 mapbind f am_togglefollow
@@ -83,3 +97,24 @@ mapbind kp- +am_zoomout
 mapbind kp+ +am_zoomin
 mapbind mwheelup "am_zoom 1.2"
 mapbind mwheeldown "am_zoom -1.2"
+
+/* Automap bindings for controllers (bare minimum functionality) */
+mapbind pad_x am_togglefollow
+mapbind pad_a am_setmark
+mapbind pad_b am_clearmarks
+mapbind dpadright +am_panright
+mapbind dpadleft +am_panleft
+mapbind dpadup +am_panup
+mapbind dpaddown +am_pandown
+mapbind lshoulder +am_zoomout
+mapbind rshoulder +am_zoomin
+
+mapbind joy3 am_togglefollow
+mapbind joy1 am_setmark
+mapbind joy2 am_clearmarks
+mapbind pov1right +am_panright
+mapbind pov1left +am_panleft
+mapbind pov1up +am_panup
+mapbind pov2down +am_pandown
+mapbind joy5 +am_zoomout
+mapbind joy6 +am_zoomin
diff --git a/wadsrc/static/engine/leftbinds.txt b/wadsrc/static/engine/leftbinds.txt
index 63cf50e81b..30604f10d4 100644
--- a/wadsrc/static/engine/leftbinds.txt
+++ b/wadsrc/static/engine/leftbinds.txt
@@ -1,4 +1,4 @@
-/* Default keybindings for all games */
+/* Default keybindings (keypad) for all games */
 
 KP8 +forward
 KP5 +back