diff --git a/lib/AtteanX/Serializer/SPARQLHTML.pm b/lib/AtteanX/Serializer/SPARQLHTML.pm
index 5fab5942..d5ef9728 100644
--- a/lib/AtteanX/Serializer/SPARQLHTML.pm
+++ b/lib/AtteanX/Serializer/SPARQLHTML.pm
@@ -140,11 +140,26 @@ Serializes the L<Attean::API::Term> object as HTML.
 				s/&/&amp;/g;
 				s/</&lt;/g;
 			}
-			my $html	= $uri;
+			my $html = qq[<a href="${uri}">$uri</a>];
+
+			if (my $map = $self->namespaces) {
+				my $abr = $map->abbreviate($uri);
+
+				if ($abr) {
+					return qq[<a href="${uri}">$abr</a>];
+				} else {
+					return $html;
+				}
+
+			} else {
+			
+				return $html;
+			}
+
+
 # 			if ($link) {
 # 				$html	= qq[<a href="${uri}">$html</a>];
 # 			}
-			return $html;
 		} elsif ($node->does('Attean::API::Literal')) {
 			my $html	= $node->value;
 			for ($html) {
@@ -162,6 +177,7 @@ Serializes the L<Attean::API::Term> object as HTML.
 		}
 	}
 	with 'Attean::API::ResultSerializer';
+	with 'Attean::API::AbbreviatingSerializer';
 }
 
 1;
diff --git a/t/issue_54.t b/t/issue_54.t
new file mode 100644
index 00000000..cc21f025
--- /dev/null
+++ b/t/issue_54.t
@@ -0,0 +1,34 @@
+use strict;
+use warnings;
+
+use Test::More tests => 4;
+use Attean;
+use Attean::IRI;
+
+my $sclass = Attean->get_serializer('SPARQLHTML');
+
+my $map = URI::NamespaceMap->new( { 
+                                    foaf => 'http://xmlns.com/foaf/0.1/'
+                                  });
+
+my $n1 = Attean::IRI->new('http://xmlns.com/foaf/0.1/Person');
+my $n2 = Attean::IRI->new('http://www.w3.org/1999/02/22-rdf-syntax-ns#type');
+	
+NAMESPACEMAP:{
+
+	my $s = $sclass->new(namespaces => $map);
+
+	is ($s->node_as_html($n1), '<a href="http://xmlns.com/foaf/0.1/Person">foaf:Person</a>', 'Return HTML link for IRI with abbrev');
+	is ($s->node_as_html($n2), '<a href="http://www.w3.org/1999/02/22-rdf-syntax-ns#type">http://www.w3.org/1999/02/22-rdf-syntax-ns#type</a>', 'Return HTML link for IRI - 1');
+
+}
+
+NO_NAMESPACEMAP:{
+
+	my $s = $sclass->new();
+	
+	is ($s->node_as_html($n1), '<a href="http://xmlns.com/foaf/0.1/Person">http://xmlns.com/foaf/0.1/Person</a>', 'Return HTML link for IRI - 2');
+	is ($s->node_as_html($n2), '<a href="http://www.w3.org/1999/02/22-rdf-syntax-ns#type">http://www.w3.org/1999/02/22-rdf-syntax-ns#type</a>', 'Return HTML link for IRI - 3');
+
+}
+
diff --git a/t/serializer-sparqlhtml.t b/t/serializer-sparqlhtml.t
index 4c0b9a2d..74c49ce7 100644
--- a/t/serializer-sparqlhtml.t
+++ b/t/serializer-sparqlhtml.t
@@ -41,11 +41,11 @@ END
 		my @rows	= ($b =~ /(<tr)/g);
 		cmp_ok(scalar(@rows), '>=', 4, 'at least 1 header row and 3 data rows');
 		like($b, qr[<td>x</td>]);
-		like($b, qr[<td>http://example.org/p</td>]);
+		like($b, qr[<td><a href="http://example.org/p">http://example.org/p</a></td>]);
 		like($b, qr[<td>1</td>]);
 		like($b, qr[<td>x</td>]);
 		like($b, qr[<td>2</td>]);
-		like($b, qr[<td>http://perlrdf.org/</td>]);
+		like($b, qr[<td><a href="http://perlrdf.org/">http://perlrdf.org/</a></td>]);
 	};
 
 	subtest 'serialize_iter_to_io' => sub {
@@ -58,11 +58,11 @@ END
 		my @rows	= ($b =~ /(<tr)/g);
 		cmp_ok(scalar(@rows), '>=', 4, 'at least 1 header row and 3 data rows');
 		like($b, qr[<td>x</td>]);
-		like($b, qr[<td>http://example.org/p</td>]);
+		like($b, qr[<td><a href="http://example.org/p">http://example.org/p</a></td>]);
 		like($b, qr[<td>1</td>]);
 		like($b, qr[<td>x</td>]);
 		like($b, qr[<td>2</td>]);
-		like($b, qr[<td>http://perlrdf.org/</td>]);
+		like($b, qr[<td><a href="http://perlrdf.org/">http://perlrdf.org/</a></td>]);
 	};
 }