diff --git a/t3lib/config_default.php b/t3lib/config_default.php
index 99587bd68e6c8ced3f9d112a5fd11ed9808cafde..c098ad58aba690d7503468d8636797eaa61be46b 100644
--- a/t3lib/config_default.php
+++ b/t3lib/config_default.php
@@ -650,7 +650,7 @@ $typo_db_extTableDef_script = '';	// The filename of an additional script in typ
 define('TYPO3_URL_GENERAL', 'http://typo3.com/');
 define('TYPO3_URL_ORG', 'http://typo3.org/');
 define('TYPO3_URL_LICENSE', 'http://typo3.org/license');
-define('TYPO3_URL_EXCEPTION', 'http://typo3.org/go/exception/');
+define('TYPO3_URL_EXCEPTION', 'http://typo3.org/go/exception/v4/');
 define('TYPO3_URL_MAILINGLISTS', 'http://lists.typo3.org/cgi-bin/mailman/listinfo');
 define('TYPO3_URL_DOCUMENTATION', 'http://typo3.org/documentation/');
 define('TYPO3_URL_DOCUMENTATION_TSREF', 'http://typo3.org/documentation/document-library/references/doc_core_tsref/current/view/');
diff --git a/t3lib/error/class.t3lib_error_debugexceptionhandler.php b/t3lib/error/class.t3lib_error_debugexceptionhandler.php
index 68103a9fda6010db3e4610e1d70b048ef82001cb..cd834145f6c584da802caf6797419f9a15c9e08a 100644
--- a/t3lib/error/class.t3lib_error_debugexceptionhandler.php
+++ b/t3lib/error/class.t3lib_error_debugexceptionhandler.php
@@ -60,12 +60,7 @@ class t3lib_error_DebugExceptionHandler extends t3lib_error_AbstractExceptionHan
 
 		$exceptionCodeNumber = ($exception->getCode() > 0) ? '#' . $exception->getCode() . ': ' : '';
 
-		/**
-		 * TODO: 25.09.2009
-		 * either remove this line or let the link point to site that offers error information for TYPO3
-		 */
-
-			//		$moreInformationLink = ($exceptionCodeNumber != '') ? '(<a href="' . TYPO3_URL_EXCEPTION . $exception->getCode() . '">More information</a>)' : '';
+		$moreInformationLink = ($exceptionCodeNumber != '') ? '(<a href="' . TYPO3_URL_EXCEPTION . 'debug/' . $exception->getCode() . '" target="_blank">More information</a>)' : '';
 		$backtraceCode = $this->getBacktraceCode($exception->getTrace());
 
 		$this->writeLogEntries($exception, self::CONTEXT_WEB);
@@ -120,7 +115,7 @@ class t3lib_error_DebugExceptionHandler extends t3lib_error_AbstractExceptionHan
 						">
 						<div style="width: 100%; background-color: #515151; color: white; padding: 2px; margin: 0 0 6px 0;">Uncaught TYPO3 Exception</div>
 						<div style="width: 100%; padding: 2px; margin: 0 0 6px 0;">
-							<strong style="color: #BE0027;">' . $exceptionCodeNumber . $exception->getMessage() . '</strong> ' . /* $moreInformationLink .*/
+							<strong style="color: #BE0027;">' . $exceptionCodeNumber . $exception->getMessage() . '</strong> ' . $moreInformationLink .
 			 '<br />
 							<br />
 							<span class="ExceptionProperty">' . get_class($exception) . '</span> thrown in file<br />
diff --git a/t3lib/error/class.t3lib_error_productionexceptionhandler.php b/t3lib/error/class.t3lib_error_productionexceptionhandler.php
index 724b209e1c946b1bddb2badef6fb7ba30daa7c51..d6576c44a07e34792e8c613cbfd46ffd469812d8 100644
--- a/t3lib/error/class.t3lib_error_productionexceptionhandler.php
+++ b/t3lib/error/class.t3lib_error_productionexceptionhandler.php
@@ -53,8 +53,16 @@ class t3lib_error_ProductionExceptionHandler extends t3lib_error_AbstractExcepti
 			header("HTTP/1.1 500 Internal Server Error");
 		}
 		$this->writeLogEntries($exception, self::CONTEXT_WEB);
+
+		if ($exception->getCode() > 0) {
+			$moreInformationLink = '<p>More information regarding this error might be available <a href="'
+								  . TYPO3_URL_EXCEPTION . $exception->getCode() . '" target="_blank">online</a>.</p>';
+		} else {
+			$moreInformationLink = '';
+		}
+
 			// we use a nice-looking title for our visitors instead of the exception's class name
-		$messageObj = t3lib_div::makeInstance('t3lib_message_ErrorPageMessage', $exception->getMessage(), 'Oops, an error occured!');
+		$messageObj = t3lib_div::makeInstance('t3lib_message_ErrorPageMessage', $exception->getMessage() . $moreInformationLink, 'Oops, an error occured!');
 		$messageObj->output();
 	}
 
diff --git a/typo3/sysext/t3skin/stylesheets/standalone/errorpage-message.css b/typo3/sysext/t3skin/stylesheets/standalone/errorpage-message.css
index cbefba8504803c2843e2c16d427baca00fae6faa..afc8afe600e9dc29d97421c71579ffdbbec93c4a 100644
--- a/typo3/sysext/t3skin/stylesheets/standalone/errorpage-message.css
+++ b/typo3/sysext/t3skin/stylesheets/standalone/errorpage-message.css
@@ -79,6 +79,10 @@ body {
 	font-weight: bold;
 }
 
+.t3-message-page p {
+	margin-bottom: 1em;
+}
+
 #t3-footer {
 	border-top: 1px solid #5c5c5c;
 	font-size: 10px;