diff --git a/Aircraft/Generic/g-forces.xml b/Aircraft/Generic/g-forces.xml
index b4c9f3f53..3f3d72bde 100644
--- a/Aircraft/Generic/g-forces.xml
+++ b/Aircraft/Generic/g-forces.xml
@@ -4,12 +4,13 @@
## ##
## Improved redout/blackout system for Flightgear ##
## ##
-## Author: Nikolai V. Chr. (property rules), Thorsten Renk (shaders) ##
+## Author: Nikolai V. Chr. (property rules), Thorsten Renk (shaders), ##
+## Benedikt Hallinger (groundshake effect) ##
## ##
## ##
## ##
## ##
-## Version 2.05 License: GPL 2.0 ##
+## Version 2.10 License: GPL 2.0 ##
## ##
###################################################################################
-->
@@ -49,6 +50,24 @@
sim/rendering/als-filters/black-factor
sim/rendering/shaders/skydome
sim/rendering/als-filters/use-filtering
+
+
+ sim/rendering/headshake/groundshake/effect-factor
+ sim/rendering/headshake/groundshake/custom-aircraft-scaler
+ sim/rendering/headshake/groundshake/default-aircraft-scaler-min-knots
+ sim/rendering/headshake/groundshake/default-aircraft-scaler-max-knots
+ sim/rendering/headshake/groundshake/default-aircraft-scaler-factor
+
+
+ sim/rendering/headshake/groundshake/internal/groundbump
+ /fdm/jsbsim/ground/bumpiness
+ sim/rendering/headshake/groundshake/internal/ground-contact
+ sim/rendering/headshake/groundshake/internal/is-moving
+ sim/rendering/headshake/groundshake/internal/default-aircraft-scaler
+
+
+ sim/rendering/headshake/groundshake/result-g
+
@@ -227,10 +246,13 @@
-
-
accelerations/pilot/z-accel-fps_sec
-
32.174
-
+
+
+
accelerations/pilot/z-accel-fps_sec
+
32.174
+
+
+
@@ -1010,4 +1032,164 @@
+
+
+
+ groundshake-terrain-g
+ false
+ gain
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+ 0.1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.0
+
+
+
+
+ Ground bumps
+
+ coherent-noise
+ false
+
+
+
+
+
+
+
+
+
+
+
+ /position/latitude-deg
+ /position/longitude-deg
+
+ 50
+
+
+
+
+ 0.5
+ false
+ 1024
+
+
+
+ Aircraft has ground contact
+
+
+ /gear/gear[0]/wow
+ /gear/gear[1]/wow
+ /gear/gear[2]/wow
+ /gear/gear[3]/wow
+
+
+
+
+
+
+ Aircraft is moving
+
+
+ /velocities/groundspeed-kt
+ 1
+
+
+
+
+
+
+ Default aircraft scaling by speed
+
+ false
+ gain
+
+
+
+
+
+
+
+ /velocities/groundspeed-kt
+
+
+
+
+
+
+ 0.0
+ 1.0
+
+
+
+
diff --git a/defaults.xml b/defaults.xml
index 373778f62..0230e89ce 100644
--- a/defaults.xml
+++ b/defaults.xml
@@ -211,7 +211,14 @@ Started September 2000 by David Megginson, david@megginson.com
false
- 0.005
+ 0.015
+
+ 1.0
+ 5.0
+ 1.0
+ 50.0
+ 0.0
+
0.05
diff --git a/gui/dialogs/cockpit-view.xml b/gui/dialogs/cockpit-view.xml
index 2482c558f..40c14fec9 100644
--- a/gui/dialogs/cockpit-view.xml
+++ b/gui/dialogs/cockpit-view.xml
@@ -63,6 +63,58 @@
dialog-apply
+
+
+ hbox
+
+
+ /sim/rendering/headshake/enabled
+
+
+ center
+
+ %2.3f
+ true
+ /sim/rendering/headshake/rate-m-g
+ /sim/rendering/headshake/enabled
+
+
+ 0.0
+ 0.1
+ /sim/rendering/headshake/rate-m-g
+ true
+
+ dialog-apply
+
+ /sim/rendering/headshake/enabled
+
+
+
+
+ hbox
+
+
+ /sim/rendering/headshake/enabled
+
+
+ center
+
+ %2.1f
+ true
+ /sim/rendering/headshake/groundshake/effect-factor
+ /sim/rendering/headshake/enabled
+
+
+ 0.0
+ 2.0
+ /sim/rendering/headshake/groundshake/effect-factor
+ true
+
+ dialog-apply
+
+ /sim/rendering/headshake/enabled
+
+
left