diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47adf77..6957a6b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
 ## Unreleased
+- Use react entities as self imported
+([#56](https://github.com/fs/react-base/pull/56))
 
 ## 1.0.0 - 2016-09-15
 - Upgrade dependencies
diff --git a/app/components/about/index.jsx b/app/components/about/index.jsx
index be29dff..339ca94 100644
--- a/app/components/about/index.jsx
+++ b/app/components/about/index.jsx
@@ -1,9 +1,9 @@
-import React from 'react';
+import React, { Component } from 'react';
 import { Link } from 'react-router';
 import { Grid } from 'react-bootstrap';
 import { paths } from 'helpers/routes';
 
-export default class About extends React.Component {
+export default class About extends Component {
   id = 'test_id'
 
   render() {
diff --git a/app/components/application/index.jsx b/app/components/application/index.jsx
index 6f7d416..bbf39ef 100644
--- a/app/components/application/index.jsx
+++ b/app/components/application/index.jsx
@@ -1,10 +1,10 @@
-import React from 'react';
+import React, { Component } from 'react';
 import Header from 'components/header';
 import Modals from 'components/modals';
 import Footer from 'components/footer';
 import styles from './styles';
 
-export default class Application extends React.Component {
+export default class Application extends Component {
   render() {
     return (
       <div className={ styles.layout }>
diff --git a/app/components/article/index.jsx b/app/components/article/index.jsx
index aaf7841..81fe835 100644
--- a/app/components/article/index.jsx
+++ b/app/components/article/index.jsx
@@ -1,9 +1,9 @@
-import React from 'react';
+import React, { Component, PropTypes } from 'react';
 
-export default class Article extends React.Component {
+export default class Article extends Component {
   static propTypes = {
-    params: React.PropTypes.shape({
-      id: React.PropTypes.string
+    params: PropTypes.shape({
+      id: PropTypes.string
     })
   }
 
diff --git a/app/components/footer/index.jsx b/app/components/footer/index.jsx
index 44ef37e..06c3305 100644
--- a/app/components/footer/index.jsx
+++ b/app/components/footer/index.jsx
@@ -1,7 +1,7 @@
-import React from 'react';
+import React, { Component } from 'react';
 import styles from './styles';
 
-export default class Footer extends React.Component {
+export default class Footer extends Component {
   render() {
     return (
       <footer className={ styles.footer }>
diff --git a/app/components/header/index.jsx b/app/components/header/index.jsx
index 5c56e3d..7ac32c8 100644
--- a/app/components/header/index.jsx
+++ b/app/components/header/index.jsx
@@ -1,10 +1,10 @@
-import React from 'react';
+import React, { Component } from 'react';
 import { Navbar } from 'react-bootstrap';
 import NavigationLeft from 'components/navigation/left';
 import NavigationRight from 'components/navigation/right';
 import { paths } from 'helpers/routes';
 
-export default class Header extends React.Component {
+export default class Header extends Component {
   render() {
     const links = [
       { title: 'Home', route: paths.home() },
diff --git a/app/components/home/index.jsx b/app/components/home/index.jsx
index df148f1..7f69f00 100644
--- a/app/components/home/index.jsx
+++ b/app/components/home/index.jsx
@@ -1,7 +1,7 @@
-import React from 'react';
+import React, { Component } from 'react';
 import { Grid, Jumbotron } from 'react-bootstrap';
 
-export default class Home extends React.Component {
+export default class Home extends Component {
   render() {
     return (
       <Grid>
diff --git a/app/components/main/index.jsx b/app/components/main/index.jsx
index 3f03fec..875c75e 100644
--- a/app/components/main/index.jsx
+++ b/app/components/main/index.jsx
@@ -1,11 +1,11 @@
-import React from 'react';
+import React, { Component } from 'react';
 import connectToStores from 'alt-utils/lib/connectToStores';
 import TodoLayout from 'components/todo/layout';
 import Home from 'components/home';
 import session from 'services/session';
 
 @connectToStores
-export default class Main extends React.Component {
+export default class Main extends Component {
   static getStores(props) {
     return [session.store()];
   }
diff --git a/app/components/modals/index.jsx b/app/components/modals/index.jsx
index ae9b6c4..8137899 100644
--- a/app/components/modals/index.jsx
+++ b/app/components/modals/index.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { Component, PropTypes } from 'react';
 import connectToStores from 'alt-utils/lib/connectToStores';
 import ApplicationStore from 'stores/application';
 import TodoModal from 'components/todoModal';
@@ -12,9 +12,9 @@ const MODALS = {
 };
 
 @connectToStores
-export default class Modals extends React.Component {
+export default class Modals extends Component {
   static propTypes = {
-    modalName: React.PropTypes.string.isRequired
+    modalName: PropTypes.string.isRequired
   }
 
   static getStores(props) {
diff --git a/app/components/navigation/index.jsx b/app/components/navigation/index.jsx
index b1a1075..4eb7f91 100644
--- a/app/components/navigation/index.jsx
+++ b/app/components/navigation/index.jsx
@@ -1,11 +1,11 @@
-import React from 'react';
+import React, { Component, PropTypes } from 'react';
 import { Link } from 'react-router';
 
-export default class Navigation extends React.Component {
+export default class Navigation extends Component {
   static propTypes = {
-    item: React.PropTypes.shape({
-      route: React.PropTypes.string,
-      title: React.PropTypes.string
+    item: PropTypes.shape({
+      route: PropTypes.string,
+      title: PropTypes.string
     })
   }
 
diff --git a/app/components/navigation/left.jsx b/app/components/navigation/left.jsx
index ba1993a..16a4ff2 100644
--- a/app/components/navigation/left.jsx
+++ b/app/components/navigation/left.jsx
@@ -1,13 +1,13 @@
-import React from 'react';
+import React, { Component, PropTypes } from 'react';
 import { Nav } from 'react-bootstrap';
 import NavigationItem from 'components/navigation';
 
-export default class NavigationLeft extends React.Component {
+export default class NavigationLeft extends Component {
   static propTypes = {
-    items: React.PropTypes.arrayOf(
-      React.PropTypes.shape({
-        route: React.PropTypes.string,
-        title: React.PropTypes.string
+    items: PropTypes.arrayOf(
+      PropTypes.shape({
+        route: PropTypes.string,
+        title: PropTypes.string
       })
     )
   }
diff --git a/app/components/navigation/right.jsx b/app/components/navigation/right.jsx
index a1d5cda..a9bc0b4 100644
--- a/app/components/navigation/right.jsx
+++ b/app/components/navigation/right.jsx
@@ -1,11 +1,11 @@
-import React from 'react';
+import React, { Component } from 'react';
 import connectToStores from 'alt-utils/lib/connectToStores';
 import { Nav, NavItem } from 'react-bootstrap';
 import ApplicationActions from 'actions/application';
 import session from 'services/session';
 
 @connectToStores
-export default class NavigationRight extends React.Component {
+export default class NavigationRight extends Component {
   static getStores(props) {
     return [session.store()];
   }
diff --git a/app/components/signinModal/index.jsx b/app/components/signinModal/index.jsx
index 4934df2..0fe19df 100644
--- a/app/components/signinModal/index.jsx
+++ b/app/components/signinModal/index.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { Component, PropTypes } from 'react';
 import connectToStores from 'alt-utils/lib/connectToStores';
 import {
   Modal,
@@ -14,12 +14,12 @@ import ApplicationStore from 'stores/application';
 import SigninStore from 'stores/signin';
 
 @connectToStores
-export default class SigninModal extends React.Component {
+export default class SigninModal extends Component {
   static propTypes = {
-    isModalOpen: React.PropTypes.bool,
-    user: React.PropTypes.shape({
-      email: React.PropTypes.string,
-      password: React.PropTypes.string
+    isModalOpen: PropTypes.bool,
+    user: PropTypes.shape({
+      email: PropTypes.string,
+      password: PropTypes.string
     })
   }
 
diff --git a/app/components/signupModal/index.jsx b/app/components/signupModal/index.jsx
index 45f4bee..a4d30c3 100644
--- a/app/components/signupModal/index.jsx
+++ b/app/components/signupModal/index.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { Component, PropTypes } from 'react';
 import connectToStores from 'alt-utils/lib/connectToStores';
 import {
   Modal,
@@ -13,14 +13,14 @@ import SignupStore from 'stores/signup';
 import ApplicationStore from 'stores/application';
 
 @connectToStores
-export default class SignupModal extends React.Component {
+export default class SignupModal extends Component {
   static propTypes = {
-    isModalOpen: React.PropTypes.bool,
-    user: React.PropTypes.shape({
-      name: React.PropTypes.string,
-      email: React.PropTypes.string,
-      password: React.PropTypes.string,
-      passwordConfirmation: React.PropTypes.string
+    isModalOpen: PropTypes.bool,
+    user: PropTypes.shape({
+      name: PropTypes.string,
+      email: PropTypes.string,
+      password: PropTypes.string,
+      passwordConfirmation: PropTypes.string
     })
   }
 
diff --git a/app/components/todo/index.jsx b/app/components/todo/index.jsx
index d94858c..9f9e0f9 100644
--- a/app/components/todo/index.jsx
+++ b/app/components/todo/index.jsx
@@ -1,15 +1,15 @@
-import React from 'react';
+import React, { Component, PropTypes } from 'react';
 import CSSTransitionGroup from 'react-addons-css-transition-group';
 import { ListGroupItem } from 'react-bootstrap';
 import TodosActions from 'actions/todos';
 import styles from './styles';
 
-export default class Todo extends React.Component {
+export default class Todo extends Component {
   static propTypes = {
-    todo: React.PropTypes.shape({
-      id: React.PropTypes.number,
-      isComplete: React.PropTypes.bool,
-      name: React.PropTypes.string
+    todo: PropTypes.shape({
+      id: PropTypes.number,
+      isComplete: PropTypes.bool,
+      name: PropTypes.string
     })
   }
 
diff --git a/app/components/todo/layout.jsx b/app/components/todo/layout.jsx
index 14a050c..934291c 100644
--- a/app/components/todo/layout.jsx
+++ b/app/components/todo/layout.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { Component, PropTypes } from 'react';
 import connectToStores from 'alt-utils/lib/connectToStores';
 import {
   Grid,
@@ -13,13 +13,13 @@ import TodoList from 'components/todo/list';
 import styles from './styles';
 
 @connectToStores
-export default class TodoLayout extends React.Component {
+export default class TodoLayout extends Component {
   static propTypes = {
-    todos: React.PropTypes.arrayOf(
-      React.PropTypes.shape({
-        id: React.PropTypes.id,
-        isComplete: React.PropTypes.bool,
-        name: React.PropTypes.string
+    todos: PropTypes.arrayOf(
+      PropTypes.shape({
+        id: PropTypes.id,
+        isComplete: PropTypes.bool,
+        name: PropTypes.string
       })
     )
   }
diff --git a/app/components/todo/list.jsx b/app/components/todo/list.jsx
index 18cad73..f5dc089 100644
--- a/app/components/todo/list.jsx
+++ b/app/components/todo/list.jsx
@@ -1,14 +1,14 @@
-import React from 'react';
+import React, { Component, PropTypes } from 'react';
 import { ListGroup } from 'react-bootstrap';
 import Todo from 'components/todo';
 
-export default class TodoList extends React.Component {
+export default class TodoList extends Component {
   static propTypes = {
-    todos: React.PropTypes.arrayOf(
-      React.PropTypes.shape({
-        id: React.PropTypes.id,
-        isComplete: React.PropTypes.bool,
-        name: React.PropTypes.string
+    todos: PropTypes.arrayOf(
+      PropTypes.shape({
+        id: PropTypes.id,
+        isComplete: PropTypes.bool,
+        name: PropTypes.string
       })
     )
   }
diff --git a/app/components/todoModal/index.jsx b/app/components/todoModal/index.jsx
index 7f243fa..b254d1f 100644
--- a/app/components/todoModal/index.jsx
+++ b/app/components/todoModal/index.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { Component, PropTypes } from 'react';
 import connectToStores from 'alt-utils/lib/connectToStores';
 import {
   Modal,
@@ -13,12 +13,12 @@ import TodoStore from 'stores/todo';
 import ApplicationStore from 'stores/application';
 
 @connectToStores
-export default class TodoModal extends React.Component {
+export default class TodoModal extends Component {
   static propTypes = {
-    isModalOpen: React.PropTypes.bool,
-    todo: React.PropTypes.shape({
-      name: React.PropTypes.string,
-      isComplete: React.PropTypes.bool
+    isModalOpen: PropTypes.bool,
+    todo: PropTypes.shape({
+      name: PropTypes.string,
+      isComplete: PropTypes.bool
     })
   }