diff --git a/phpBB/includes/captcha/captcha_gd.php b/phpBB/includes/captcha/captcha_gd.php
index 2232498201..4a8dd893a7 100644
--- a/phpBB/includes/captcha/captcha_gd.php
+++ b/phpBB/includes/captcha/captcha_gd.php
@@ -116,7 +116,7 @@ class captcha
 		{
 			for ($i = 0; $i < $code_len; ++$i)
 			{
-				$noise[$i] = new char_cube3d($noise_bitmaps, mt_rand(1, 1 + count($noise_bitmaps)));
+				$noise[$i] = new char_cube3d($noise_bitmaps, mt_rand(1, count($noise_bitmaps['data'])));
 
 				list($min, $max) = $noise[$i]->range();
 				//$box = $noise[$i]->dimensions($sizes[$i]);
@@ -232,39 +232,53 @@ class captcha
 	function captcha_noise_bitmaps()
 	{
 		return array(
-			'width'		=> 9,
+			'width'		=> 15,
 			'height'	=> 5,
 			'data'		=> array(
 
 			1 => array(
-				array(1,0,0,0,1,0,0,0,0),
-				array(1,0,0,0,0,1,0,0,0),
-				array(1,0,0,0,0,1,0,0,0),
-				array(1,0,0,0,0,1,0,0,0),
-				array(1,0,0,0,0,0,1,0,0),
+				array(1,0,0,0,1,0,0,0,0,0,0,0,0,0,0),
+				array(1,0,0,0,0,1,0,0,0,0,0,0,0,0,0),
+				array(1,0,0,0,0,1,0,0,0,0,0,0,0,0,0),
+				array(1,0,0,0,0,1,0,0,0,0,0,0,0,0,0),
+				array(1,0,0,0,0,0,1,0,0,0,0,0,0,0,0),
 			),
 			2 => array(
-				array(1,1,1,1,1,1,1,1,1),
-				array(0,0,0,0,0,0,0,1,0),
-				array(0,0,0,0,0,0,0,0,0),
-				array(0,0,0,0,0,0,0,0,0),
-				array(0,0,0,0,0,0,0,0,0),
+				array(1,1,1,1,1,1,1,1,1,0,0,0,0,0,0),
+				array(0,0,0,0,0,0,0,1,0,0,0,0,0,0,0),
+				array(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
+				array(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
+				array(0,0,0,0,0,0,0,0,0,1,1,1,1,1,1),
 			),
 			3 => array(
-				array(1,0,0,0,0,0,0,0,0),
-				array(1,0,0,0,0,0,0,0,0),
-				array(1,0,0,0,0,0,0,0,0),
-				array(1,0,0,0,0,0,0,0,0),
-				array(1,0,0,0,0,0,0,0,0),
+				array(1,0,0,0,0,0,0,0,0,0,0,0,0,0,1),
+				array(1,0,0,0,0,0,0,0,0,0,0,0,0,1,0),
+				array(1,0,0,0,0,0,0,0,0,0,0,0,0,0,1),
+				array(1,0,0,0,0,0,0,0,0,0,0,0,0,1,0),
+				array(1,0,0,0,0,0,0,0,0,0,0,0,0,0,1),
 			),
 			4 => array(
-				array(1,0,1,0,1,0,0,1,1),
-				array(0,0,0,0,0,0,0,1,0),
-				array(0,0,0,0,0,0,0,0,0),
-				array(0,0,0,0,0,0,0,0,0),
-				array(1,0,1,0,0,0,0,0,0),
+				array(1,0,1,0,1,0,0,1,1,0,0,0,0,0,0),
+				array(0,0,0,0,0,0,0,1,0,0,0,0,0,0,0),
+				array(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
+				array(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
+				array(1,0,1,0,0,0,0,0,0,0,0,0,0,0,0),
 			),
-	));
+			5 => array(
+				array(1,1,1,1,1,1,1,1,1,1,1,1,1,1,1),
+				array(0,0,0,0,0,0,0,1,0,0,0,0,0,0,0),
+				array(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
+				array(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
+				array(1,0,1,0,0,0,0,0,0,0,0,0,0,0,0),
+			),
+			6 => array(
+				array(mt_rand(0,1),mt_rand(0,1),mt_rand(0,1),mt_rand(0,1),mt_rand(0,1),mt_rand(0,1),mt_rand(0,1),mt_rand(0,1),mt_rand(0,1),mt_rand(0,1),mt_rand(0,1),mt_rand(0,1),mt_rand(0,1),mt_rand(0,1),mt_rand(0,1)),
+				array(0,0,0,0,0,0,0,mt_rand(0,1),0,0,0,0,0,0,0),
+				array(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
+				array(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
+				array(mt_rand(0,1),0,mt_rand(0,1),0,0,0,0,0,0,0,0,0,0,0,0),
+			),
+		));
 	}
 	
 	/**