diff --git a/README b/README
index 87697954..d29b44ba 100644
--- a/README
+++ b/README
@@ -27,6 +27,7 @@ Content of this file:
    1.3 Addons
    1.4 Dependencies
    1.5 Compiling
+   1.6 Default configuration
  
  2. OGG/Vorbis playback
    2.1 Setup for the original soundtrack
@@ -123,6 +124,14 @@ directory structure:
 - baseq2/game.so 
 - ctf/game.so (not for the demo version)
 
+1.6 Default configuration
+-------------------------
+Quake II ships with an old and for today standards "insane" default
+configuration. This is no problem since you can alter everything. To
+make the life easier Yamagi Quake II contains an updated default
+configuration. If you want to use it just copy stuff/yq2.cfg to
+your baseq2/ folder.
+
 You should now be ready to start your brand new Quake II. Have fun.
 
 ===============================================================================
@@ -144,7 +153,7 @@ after their track number. Remember! Since the first track on the CD ist
 "data", the first audio track is number 2! If everything is done
 correct, you should have: 02.ogg, 03.ogg, ..., 11.ogg. Alternatively you
 can use a script provided by caedes, which can be found in the folder
-"tools". It needs cdparanoia and oggenc, it should work with the main
+"stuff/". It needs cdparanoia and oggenc, it should work with the main
 game and both addons.
 Put these files under baseq2/music, start Quake II, enter the "Options"
 menu and set "OGG music" to enabled. "CD music" will be automaticly
@@ -400,7 +409,7 @@ fixed amount of time!
  - This is a known bug in some linux distributions. SDL fails to disable
    the screensaver even if we tell him to do so. See this Ubuntu bugreport: 
    https://bugs.launchpad.net/ubuntu/+source/gnome-screensaver/+bug/32457
-   As a work around use the startscript in tools/quake-start.sh It
+   As a work around use the startscript in stuff/quake-start.sh It
    deactivates the screensaver before starting Quake II and reenables it
    after exiting the game.
 
diff --git a/TODO b/TODO
deleted file mode 100644
index 881d3db6..00000000
--- a/TODO
+++ /dev/null
@@ -1,4 +0,0 @@
-client:
-- Integrate a signalhandler and print an backtrace with Maxims
-  libexecinfo (only 2 sourcefiles, BSD licensed)
-- Add a optional overwrite for the defaults.cfg
diff --git a/src/client/menu/menu.c b/src/client/menu/menu.c
index 8be29861..8ba37631 100644
--- a/src/client/menu/menu.c
+++ b/src/client/menu/menu.c
@@ -1036,6 +1036,7 @@ static void ControlsSetMenuItemValues( void ) {
 
 static void ControlsResetDefaultsFunc( void *unused ) {
 	Cbuf_AddText ("exec default.cfg\n");
+	Cbuf_AddText ("exec yq2.cfg\n");
 	Cbuf_Execute();
 
 	ControlsSetMenuItemValues();
diff --git a/src/common/misc.c b/src/common/misc.c
index d508d667..f61be907 100644
--- a/src/common/misc.c
+++ b/src/common/misc.c
@@ -214,6 +214,7 @@ void Qcommon_Init (int argc, char **argv)
 	FS_InitFilesystem ();
 
 	Cbuf_AddText ("exec default.cfg\n");
+	Cbuf_AddText ("exec yq2.cfg\n");
 	Cbuf_AddText ("exec config.cfg\n");
 
 	Cbuf_AddEarlyCommands (true);
diff --git a/tools/cdripper.sh b/stuff/cdripper.sh
similarity index 100%
rename from tools/cdripper.sh
rename to stuff/cdripper.sh
diff --git a/tools/quake2-start.sh b/stuff/quake2-start.sh
similarity index 100%
rename from tools/quake2-start.sh
rename to stuff/quake2-start.sh
diff --git a/stuff/yq2.cfg b/stuff/yq2.cfg
new file mode 100644
index 00000000..bb01ce99
--- /dev/null
+++ b/stuff/yq2.cfg
@@ -0,0 +1,104 @@
+//
+// KEY BINDINGS
+//
+
+unbindall
+
+bind 1 "use Blaster"
+bind 2 "use Shotgun"
+bind 3 "use Super Shotgun"
+bind 4 "use Machinegun"
+bind 5 "use Chaingun"
+bind 6 "use Grenade Launcher"
+bind 7 "use Rocket Launcher"
+bind 8 "use HyperBlaster"
+bind 9 "use Railgun"
+bind 0 "use BFG10K"
+
+bind    MOUSE1	+attack
+
+bind    d			+back
+bind    e		    +forward
+bind    s           +moveleft
+bind    a           +left
+bind    f           +moveright
+bind    g           +right
+
+bind    TAB         inven
+bind    ENTER       invuse
+bind    o           invprev
+bind    p           invnext
+bind	BACKSPACE   invdrop	
+
+bind	MWHEELUP	weapnext
+bind	WHEELDOWN	weapprev
+
+bind	q			use quad damage
+
+bind    SHIFT 		+speed
+
+bind    SPACE       +movedown 
+bind    MOUSE2      +moveup 
+
+bind    PAUSE       "pause"
+bind    ESCAPE      "togglemenu"
+
+bind    F1          "cmd help"
+bind	F5			"echo Quick Saving...; wait; save quick"
+bind	F9			"echo Quick Loading...; wait; load quick"
+bind	F12			"screenshot"
+
+bind    t           "messagemode"
+
+//----------------------------------------------
+
+//
+// DEFAULT CVARS
+//
+
+set viewsize		100
+set	vid_fullscreen	0
+set sensitivity     3
+set crosshair		1
+set cl_run			1
+set hand			0
+set m_pitch         0.022
+set m_yaw           0.022
+set m_forward       1
+set m_side          0.8
+set lookspring		0
+set lookstrafe		0
+set freelook		1
+set ogg_enable		1
+set cd_nocd			1
+
+//----------------------------------------------
+
+//
+// userinfo
+//
+
+set name Player
+set skin male/grunt
+
+//----------------------------------------------
+
+//
+//	the demo loop. do NOT change this!
+//
+alias   d1      "demomap idlog.cin ; set nextserver d2"
+alias   d2      "demomap demo1.dm2 ; set nextserver d3"
+alias   d3      "demomap idlog.cin ; set nextserver d4"
+alias   d4      "demomap demo2.dm2 ; set nextserver d1"
+
+//
+// newgame command. do NOT change this!
+//
+alias   newgame " killserver ; maxclients 1 ; deathmatch 0 ; map *ntro.cin+base1"
+
+//
+// dedicated server startup. do NOT change this!
+//
+alias	dedicated_start	"map base1"
+
+