diff --git a/src/app/components/noosfero-blocks/block.component.ts b/src/app/components/noosfero-blocks/block.component.ts
index 88ae339..f1793a5 100644
--- a/src/app/components/noosfero-blocks/block.component.ts
+++ b/src/app/components/noosfero-blocks/block.component.ts
@@ -12,7 +12,7 @@ export class Block {
 
     ngOnInit() {
         let blockName = this.block.type ? this.block.type.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase() : "default-block";
-        this.$element.replaceWith(this.$compile('<noosfero-' + blockName + ' block="ctrl.block" owner="ctrl.owner"></noosfero-' + blockName + '>')(this.$scope));
+        this.$element.replaceWith(this.$compile('<noosfero-' + blockName + ' [block]="ctrl.block" [owner]="ctrl.owner"></noosfero-' + blockName + '>')(this.$scope));
     }
 
     constructor(private $element: any, private $scope: ng.IScope, private $injector: ng.auto.IInjectorService, private $compile: ng.ICompileService) {
diff --git a/src/app/components/noosfero-blocks/link-list/link-list.component.js b/src/app/components/noosfero-blocks/link-list/link-list.component.js
deleted file mode 100644
index fb5ce37..0000000
--- a/src/app/components/noosfero-blocks/link-list/link-list.component.js
+++ /dev/null
@@ -1,21 +0,0 @@
-(function() {
-  'use strict';
-
-  angular
-    .module('noosferoApp')
-    .component('noosferoLinkListBlock', {
-      restrict: 'E',
-      templateUrl: 'app/components/noosfero-blocks/link-list/link-list.html',
-      bindings: {
-          block: '<',
-          owner: '<'
-      },
-      controller: LinkListBlockController
-    });
-
-  /** @ngInject */
-  function LinkListBlockController() {
-    this.links = this.block.settings.links;
-  }
-
-})();
diff --git a/src/app/components/noosfero-blocks/link-list/link-list.component.ts b/src/app/components/noosfero-blocks/link-list/link-list.component.ts
new file mode 100644
index 0000000..58ba6b6
--- /dev/null
+++ b/src/app/components/noosfero-blocks/link-list/link-list.component.ts
@@ -0,0 +1,18 @@
+import {Component, Input} from "ng-forward";
+
+@Component({
+    selector: "noosfero-link-list-block",
+    templateUrl: "app/components/noosfero-blocks/link-list/link-list.html"
+})
+export class LinkListBlock {
+
+    @Input() block: any;
+    @Input() owner: any;
+
+    links: any;
+
+    ngOnInit() {
+        this.links = this.block.settings.links;
+    }
+
+}
diff --git a/src/app/components/noosfero-blocks/link-list/link-list.html b/src/app/components/noosfero-blocks/link-list/link-list.html
index 7915222..f874ad4 100644
--- a/src/app/components/noosfero-blocks/link-list/link-list.html
+++ b/src/app/components/noosfero-blocks/link-list/link-list.html
@@ -1,6 +1,6 @@
 <div class="link-list-block">
-  <div ng-repeat="link in $ctrl.links">
-    <a ng-href="{{link.address | noosferoTemplateFilter:{profile: $ctrl.owner.identifier} }}">
+  <div ng-repeat="link in ctrl.links">
+    <a ng-href="{{link.address | noosferoTemplateFilter:{profile: ctrl.owner.identifier} }}">
       <i class="fa fa-fw icon-{{link.icon}}"></i> <span>{{link.name}}</span>
     </a>
   </div>
diff --git a/src/app/index.ts b/src/app/index.ts
index f77701a..b3c5d62 100644
--- a/src/app/index.ts
+++ b/src/app/index.ts
@@ -44,7 +44,6 @@ NoosferoApp.addController("AuthController", AuthController);
 require("./components/navbar/navbar.directive.js");
 require("./components/noosfero-activities/activities.component.js");
 require("./components/noosfero-activities/activity/activity.component.js");
-require("./components/noosfero-blocks/link-list/link-list.component.js");
 require("./components/noosfero-blocks/main-block/main-block.component.js");
 require("./components/noosfero-blocks/members-block/members-block.component.js");
 require("./components/noosfero-blocks/profile-image/profile-image.component.js");
diff --git a/src/app/main/main.component.ts b/src/app/main/main.component.ts
index 9b2b28b..8f610ba 100644
--- a/src/app/main/main.component.ts
+++ b/src/app/main/main.component.ts
@@ -6,6 +6,7 @@ import {ArticleView} from "../components/noosfero-articles/article/article_view"
 import {Profile} from "../profile/profile.component";
 import {Boxes} from "../components/noosfero-boxes/boxes.component";
 import {Block} from "../components/noosfero-blocks/block.component";
+import {LinkListBlock} from "../components/noosfero-blocks/link-list/link-list.component";
 
 
 import {AuthService} from "./../components/auth/auth_service";
@@ -23,7 +24,7 @@ export class MainContent {
 @Component({
     selector: 'main',
     template: '<div ng-view></div>',
-    directives: [NoosferoArticleBlog, ArticleView, Boxes, Block],
+    directives: [NoosferoArticleBlog, ArticleView, Boxes, Block, LinkListBlock],
     providers: [AuthService, Session]
 })
 @StateConfig([
--
libgit2 0.21.2