diff --git a/src/display.h b/src/display.h
index d937f8399..827fa595e 100644
--- a/src/display.h
+++ b/src/display.h
@@ -191,8 +191,14 @@ extern BOOL	getRotActive( void );
 extern SDWORD	getDesiredPitch( void );
 extern void	setDesiredPitch(SDWORD pitch);
 
-#define MAX_PLAYER_X_ANGLE	(-14)
-#define MIN_PLAYER_X_ANGLE	(-50)
+#define MAX_PLAYER_X_ANGLE	(-1)
+#define MIN_PLAYER_X_ANGLE	(-60)
+
+#define MAXDISTANCE	(3500)
+#define MINDISTANCE	(500)
+#define START_DISTANCE	(1500)
+
+#define CAMERA_PIVOT_HEIGHT (500)
 
 #define	HIDDEN_FRONTEND_WIDTH	(640)
 #define	HIDDEN_FRONTEND_HEIGHT	(480)
diff --git a/src/display3d.c b/src/display3d.c
index 59f87f20f..f4bc0de4b 100644
--- a/src/display3d.c
+++ b/src/display3d.c
@@ -389,7 +389,7 @@ void draw3DScene( void )
 	{
 		/* Move the autonomous camera if necessary */
 		calcAverageTerrainHeight(&player);
-		trackHeight(2 * averageCentreTerrainHeight);
+		trackHeight(averageCentreTerrainHeight+CAMERA_PIVOT_HEIGHT);
 	}
 	else
 	{
@@ -4012,6 +4012,7 @@ static void trackHeight( float desiredHeight )
 	/* Adjust the height accordingly */
 	player.p.y += heightSpeed * fraction;
 
+#if 0
 	/* Now do auto pitch as well, but only if we're not using mouselook and not tracking */
 	if(!getWarCamStatus() && !getRotActive())
 	{
@@ -4037,6 +4038,7 @@ static void trackHeight( float desiredHeight )
 			player.r.x += aSpeed * fraction;
 		}
 	}
+#endif
 }
 
 
diff --git a/src/display3d.h b/src/display3d.h
index 41315d7dd..1ee45e551 100644
--- a/src/display3d.h
+++ b/src/display3d.h
@@ -22,6 +22,7 @@
 #ifndef _display3d_h
 #define _display3d_h
 
+#include "display.h"
 #include "display3ddef.h"	// This should be the only place including this file
 #include "lib/ivis_common/pietypes.h"
 #include "lib/ivis_common/piedef.h"
diff --git a/src/display3ddef.h b/src/display3ddef.h
index 02e81f727..23cdb1dee 100644
--- a/src/display3ddef.h
+++ b/src/display3ddef.h
@@ -36,8 +36,5 @@
 
 #define LAND_XGRD	(VISIBLE_XTILES + 1)
 #define LAND_YGRD	(VISIBLE_YTILES + 1)
-#define MAXDISTANCE	(4500)
-#define MINDISTANCE	(1500)
-#define START_DISTANCE	(2500)
 
 #endif