diff --git a/package.json b/package.json
index b0ee1fb63df..6f2cc89c78c 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "express": "^4.5.0",
     "github": "^0.2.3",
     "glob": "~4.3.2",
-    "htmlbars": "0.13.13",
+    "htmlbars": "0.13.15",
     "qunit-extras": "^1.3.0",
     "qunitjs": "^1.16.0",
     "route-recognizer": "0.1.5",
diff --git a/packages/ember-htmlbars/lib/hooks/component.js b/packages/ember-htmlbars/lib/hooks/component.js
index 3df745ce558..78662caf531 100644
--- a/packages/ember-htmlbars/lib/hooks/component.js
+++ b/packages/ember-htmlbars/lib/hooks/component.js
@@ -1,6 +1,6 @@
 import ComponentNodeManager from "ember-htmlbars/node-managers/component-node-manager";
 
-export default function componentHook(renderNode, env, scope, tagName, attrs, template, visitor) {
+export default function componentHook(renderNode, env, scope, tagName, params, attrs, template, visitor) {
   var state = renderNode.state;
 
   // Determine if this is an initial render or a re-render
@@ -14,6 +14,7 @@ export default function componentHook(renderNode, env, scope, tagName, attrs, te
 
   var manager = ComponentNodeManager.create(renderNode, env, {
     tagName,
+    params,
     attrs,
     parentView,
     template,
diff --git a/packages/ember-htmlbars/lib/keywords/component.js b/packages/ember-htmlbars/lib/keywords/component.js
index 0b857cb95ff..c4947bfc0af 100644
--- a/packages/ember-htmlbars/lib/keywords/component.js
+++ b/packages/ember-htmlbars/lib/keywords/component.js
@@ -22,6 +22,6 @@ export default {
       return;
     }
 
-    env.hooks.component(morph, env, scope, componentPath, hash, template, visitor);
+    env.hooks.component(morph, env, scope, componentPath, params, hash, template, visitor);
   }
 };
diff --git a/packages/ember-htmlbars/lib/keywords/input.js b/packages/ember-htmlbars/lib/keywords/input.js
index 5e66e46a5c0..be32c47e94e 100644
--- a/packages/ember-htmlbars/lib/keywords/input.js
+++ b/packages/ember-htmlbars/lib/keywords/input.js
@@ -13,7 +13,7 @@ export default {
   },
 
   render(morph, env, scope, params, hash, template, inverse, visitor) {
-    env.hooks.component(morph, env, scope, morph.state.componentName, hash, template, visitor);
+    env.hooks.component(morph, env, scope, morph.state.componentName, params, hash, template, visitor);
   },
 
   rerender(...args) {
diff --git a/packages/ember-htmlbars/lib/keywords/textarea.js b/packages/ember-htmlbars/lib/keywords/textarea.js
index 7b95f1e4f02..656096ae2b2 100644
--- a/packages/ember-htmlbars/lib/keywords/textarea.js
+++ b/packages/ember-htmlbars/lib/keywords/textarea.js
@@ -4,6 +4,6 @@
 */
 
 export default function textarea(morph, env, scope, originalParams, hash, template, inverse, visitor) {
-  env.hooks.component(morph, env, scope, '-text-area', hash, template, visitor);
+  env.hooks.component(morph, env, scope, '-text-area', originalParams, hash, template, visitor);
   return true;
 }
diff --git a/packages/ember-htmlbars/lib/node-managers/component-node-manager.js b/packages/ember-htmlbars/lib/node-managers/component-node-manager.js
index 1873732b7a3..01e43be1fa9 100644
--- a/packages/ember-htmlbars/lib/node-managers/component-node-manager.js
+++ b/packages/ember-htmlbars/lib/node-managers/component-node-manager.js
@@ -28,6 +28,7 @@ export default ComponentNodeManager;
 
 ComponentNodeManager.create = function(renderNode, env, options) {
   let { tagName,
+        params,
         attrs,
         parentView,
         parentScope,
@@ -89,6 +90,13 @@ ComponentNodeManager.create = function(renderNode, env, options) {
     }
 
     renderNode.emberView = component;
+
+    if (component.positionalParams) {
+      let pp = component.positionalParams;
+      for (let i=0; i<pp.length; i++) {
+        attrs[pp[i]] = params[i];
+      }
+    }
   }
 
   var results = buildComponentTemplate({ layout: layout, component: component }, attrs, {
diff --git a/packages/ember-htmlbars/tests/integration/attribute_bindings_test.js b/packages/ember-htmlbars/tests/integration/attribute_bindings_test.js
index e7add55321c..50b289b57c9 100644
--- a/packages/ember-htmlbars/tests/integration/attribute_bindings_test.js
+++ b/packages/ember-htmlbars/tests/integration/attribute_bindings_test.js
@@ -7,7 +7,7 @@ import { set } from 'ember-metal/property_set';
 
 var view;
 
-QUnit.module('ember-htmlbars: {{#with}} and {{#view}} integration', {
+QUnit.module('ember-htmlbars: custom morph integration tests', {
   teardown() {
     runDestroy(view);
   }
@@ -32,3 +32,23 @@ QUnit.test('can properly re-render an if/else with attribute morphs', function()
 
   equal(view.$('.falsey').length, 1, 'inverse block rendered properly');
 });
+
+QUnit.test('can properly re-render an if/else with element morphs', function() {
+  view = EmberView.create({
+    trueClass: 'truthy',
+    falseClass: 'falsey',
+    switch: true,
+
+    template: compile('{{#if view.switch}}<div class="truthy" {{action view.trueClass}}>Truthy</div>{{else}}<div class="falsey" {{action view.falseClass}}>Falsey</div>{{/if}}')
+  });
+
+  runAppend(view);
+
+  equal(view.$('.truthy').length, 1, 'template block rendered properly');
+
+  run(function() {
+    set(view, 'switch', false);
+  });
+
+  equal(view.$('.falsey').length, 1, 'inverse block rendered properly');
+});
diff --git a/packages/ember-htmlbars/tests/integration/component_invocation_test.js b/packages/ember-htmlbars/tests/integration/component_invocation_test.js
index 18d48780399..398f9d5fe98 100644
--- a/packages/ember-htmlbars/tests/integration/component_invocation_test.js
+++ b/packages/ember-htmlbars/tests/integration/component_invocation_test.js
@@ -233,3 +233,43 @@ if (Ember.FEATURES.isEnabled('ember-views-component-block-info')) {
     equal(jQuery('#qunit-fixture').text(), 'In block No Block Param!');
   });
 }
+
+QUnit.test('static positional parameters', function() {
+  registry.register('template:components/sample-component', compile('{{attrs.name}}{{attrs.age}}'));
+  registry.register('component:sample-component', Component.extend({
+    positionalParams: ['name', 'age']
+  }));
+
+  view = EmberView.extend({
+    layout: compile('{{sample-component "Quint" 4}}'),
+    container: container
+  }).create();
+
+  runAppend(view);
+
+  equal(jQuery('#qunit-fixture').text(), 'Quint4');
+});
+
+QUnit.test('dynamic positional parameters', function() {
+  registry.register('template:components/sample-component', compile('{{attrs.name}}{{attrs.age}}'));
+  registry.register('component:sample-component', Component.extend({
+    positionalParams: ['name', 'age']
+  }));
+
+  view = EmberView.extend({
+    layout: compile('{{sample-component myName myAge}}'),
+    container: container,
+    context: {
+      myName: 'Quint',
+      myAge: 4
+    }
+  }).create();
+
+  runAppend(view);
+  equal(jQuery('#qunit-fixture').text(), 'Quint4');
+  run(function() {
+    Ember.set(view.context, 'myName', 'Edward');
+    Ember.set(view.context, 'myAe', '5');
+  });
+
+});
diff --git a/packages/ember-routing-htmlbars/lib/keywords/link-to.js b/packages/ember-routing-htmlbars/lib/keywords/link-to.js
index f1fb60a4754..3c456822cb7 100644
--- a/packages/ember-routing-htmlbars/lib/keywords/link-to.js
+++ b/packages/ember-routing-htmlbars/lib/keywords/link-to.js
@@ -297,7 +297,7 @@ export default {
 
     attrs.escaped = !morph.parseTextAsHTML;
 
-    env.hooks.component(morph, env, scope, '-link-to', attrs, template, visitor);
+    env.hooks.component(morph, env, scope, '-link-to', params, attrs, template, visitor);
   },
 
   rerender(morph, env, scope, params, hash, template, inverse, visitor) {