diff --git a/addon/components/paper-divider.js b/addon/components/paper-divider.js
deleted file mode 100644
index 0ad01ccd8..000000000
--- a/addon/components/paper-divider.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @module ember-paper
- */
-import Component from '@ember/component';
-
-import { computed } from '@ember/object';
-
-/**
- * @class PaperDivider
- * @extends Ember.Component
- */
-export default Component.extend({
-  tagName: 'md-divider',
-  attributeBindings: ['insetAttr:md-inset'],
-  inset: false,
-  classNames: ['paper-divider', 'md-default-theme'],
-
-  /*
-   * Not binding boolean values in Ember 1.8.1?
-   * https://github.com/emberjs/ember.js/issues/9595
-   */
-  insetAttr: computed('inset', function() {
-    return this.get('inset') ? 'md-inset' : null;
-  })
-});
diff --git a/addon/components/paper-divider/component.js b/addon/components/paper-divider/component.js
new file mode 100644
index 000000000..0d401b0da
--- /dev/null
+++ b/addon/components/paper-divider/component.js
@@ -0,0 +1,16 @@
+/**
+ * @module ember-paper
+ */
+import Component from '@ember/component';
+import { tagName, layout } from '@ember-decorators/component';
+import template from './template';
+
+/**
+ * @class PaperDivider
+ * @extends Component
+ */
+@tagName('')
+@layout(template)
+class PaperDivider extends Component { }
+
+export default PaperDivider;
diff --git a/addon/components/paper-divider/template.hbs b/addon/components/paper-divider/template.hbs
new file mode 100644
index 000000000..c1d559817
--- /dev/null
+++ b/addon/components/paper-divider/template.hbs
@@ -0,0 +1,4 @@
+<md-divider
+  class="md-default-theme"
+  md-inset={{@inset}}
+  ...attributes></md-divider>
\ No newline at end of file
diff --git a/app/components/paper-divider.js b/app/components/paper-divider.js
index a549cd66f..dd9ae5e1e 100644
--- a/app/components/paper-divider.js
+++ b/app/components/paper-divider.js
@@ -1,3 +1 @@
-import PaperDivider from 'ember-paper/components/paper-divider';
-
-export default PaperDivider;
+export { default} from 'ember-paper/components/paper-divider/component';