diff --git a/bridges/CryptomeBridge.php b/bridges/CryptomeBridge.php
index a2991c18..ad9e75ec 100644
--- a/bridges/CryptomeBridge.php
+++ b/bridges/CryptomeBridge.php
@@ -6,7 +6,6 @@ class CryptomeBridge extends BridgeAbstract {
 	const URI = 'https://cryptome.org/';
 	const CACHE_TIMEOUT = 21600; //6h
 	const DESCRIPTION = 'Returns the N most recent documents.';
-
 	const PARAMETERS = array( array(
 		'n' => array(
 			'name' => 'number of elements',
@@ -16,29 +15,30 @@ class CryptomeBridge extends BridgeAbstract {
 		)
 	));
 
+	public function getIcon() {
+		return self::URI . '/favicon.ico';
+	}
+
 	public function collectData(){
 		$html = getSimpleHTMLDOM(self::URI);
 
 		$number = $this->getInput('n');
-
-		/* number of documents */
 		if(!empty($number)) {
 			$num = min($number, 20);
 		}
-
-		foreach($html->find('pre') as $element) {
-			for($i = 0; $i < $num; ++$i) {
+		$i = 0;
+		foreach($html->find('pre', 1)->find('b') as $element) {
+			foreach($element->find('a') as $element1) {
 				$item = array();
-				$item['uri'] = self::URI . substr($element->find('a', $i)->href, 20);
-				$item['title'] = substr($element->find('b', $i)->plaintext, 22);
-				$item['content'] = preg_replace(
-					'#http://cryptome.org/#',
-					self::URI,
-					$element->find('b', $i)->innertext
-				);
+				$item['uri'] = $element1->href;
+				$item['title'] = $element->plaintext;
 				$this->items[] = $item;
+
+				if ($i > $num) {
+					break 2;
+				}
+				$i++;
 			}
-			break;
 		}
 	}
 }