diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 766ba6f73b..9c7198d19d 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2008/07/31
+	* Improved: added --enable-debug=gdb option in configure script to use gdb optimized debug mode [akrus]
 	* Removed the mob controller system, now a customization (see topic:194375) [ultramage]
 	* Fixed: commented out loginlog in convert engine sql tables (loginlog table is in logs database now) [akrus]
 2008/07/30
diff --git a/configure b/configure
index c94e71e727..66966f4934 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 13000 .
+# From configure.in Revision: 13024 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -1260,6 +1260,7 @@ Optional Features:
                           instead of TXT files in the sql map-server.
                           (disabled by default)
   --enable-debug          Compiles extra debug code. (disabled by default)
+                          (available options: yes, no, gdb)
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1793,8 +1794,9 @@ if test "${enable_debug+set}" = set; then
   enableval=$enable_debug;
 		enable_debug="$enableval"
 		case $enableval in
-			no);;
-			yes);;
+			"no");;
+			"yes");;
+			"gdb");;
 			*) { { echo "$as_me:$LINENO: error: invalid argument --enable-debug=$enableval... stopping" >&5
 echo "$as_me: error: invalid argument --enable-debug=$enableval... stopping" >&2;}
    { (exit 1); exit 1; }; };;
@@ -4525,9 +4527,17 @@ fi
 #
 # Debug
 #
-if test "$enable_debug" = "yes" ; then
-	CFLAGS="$CFLAGS -g -DDEBUG"
-fi
+case $enable_debug in
+	"no")
+		# default value
+		;;
+	"yes")
+		CFLAGS="$CFLAGS -g -DDEBUG"
+		;;
+	"gdb")
+		CFLAGS="$CFLAGS -ggdb -DDEBUG"
+		;;
+esac
 
 
 #
diff --git a/configure.in b/configure.in
index 5ebbe15615..aab1f58fb1 100644
--- a/configure.in
+++ b/configure.in
@@ -78,13 +78,15 @@ AC_ARG_ENABLE(
 	[debug],
 	AC_HELP_STRING(
 		[--enable-debug],
-		[Compiles extra debug code. (disabled by default)]
+		[Compiles extra debug code. (disabled by default)],
+		[(available options: yes, no, gdb)]
 	),
 	[
 		enable_debug="$enableval"
 		case $enableval in
-			no);;
-			yes);;
+			"no");;
+			"yes");;
+			"gdb");;
 			*) AC_MSG_ERROR([[invalid argument --enable-debug=$enableval... stopping]]);;
 		esac
 	],
@@ -347,9 +349,17 @@ fi
 #
 # Debug
 #
-if test "$enable_debug" = "yes" ; then
-	CFLAGS="$CFLAGS -g -DDEBUG"
-fi
+case $enable_debug in
+	"no")
+		# default value
+		;;
+	"yes")
+		CFLAGS="$CFLAGS -g -DDEBUG"
+		;;
+	"gdb")
+		CFLAGS="$CFLAGS -ggdb -DDEBUG"
+		;;
+esac
 
 
 #