diff --git a/inc/config.php b/inc/config.php
index efde7f81..283a9282 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -68,7 +68,9 @@
 	define('AUTO_UNICODE',	true);
 	// Whether to turn URLs into functional links
 	define('MARKUP_URLS',	true);
-	define('URL_REGEX',		"/(https?|ftp)\:\/\/([a-z0-9+!*(),;?&=\$_.-]+(\:[a-z0-9+!*(),;?&=\$_.-]+)?@)?([a-z0-9-.]*)\.([a-z]{2,3})(\:[0-9]{2,5})?(\/([a-z0-9+\$_-]\.?)+)*\/?(\?[a-z+&\$_.-][a-z0-9;:@&%=+\/\$_.-]*)?(#[a-z_.-][a-z0-9+\$_.-]*)?/");
+	
+	//								scheme					domain							location
+	define('URL_REGEX',		'/' .	'(https?|ftp):\/\/' .	'([\w\-]+\.)+[a-zA-Z]{2,6}' .	'(\/([\w\-~\.#\/?=&;:+%]+))?' . '/');
 	
 	// Allowed file extensions
 	$allowed_ext = Array('jpg', 'jpeg', 'bmp', 'gif', 'png');