diff --git a/.flowconfig b/.flowconfig
new file mode 100644
index 000000000..5a6f29e1a
--- /dev/null
+++ b/.flowconfig
@@ -0,0 +1,19 @@
+[ignore]
+<PROJECT_ROOT>/node_modules/fbjs/.*
+
+[include]
+
+[libs]
+
+[options]
+module.use_strict=true
+munge_underscores=true
+suppress_comment= \\(.\\|\n\\)*\\$FlowDisableLine
+suppress_comment= \\(.\\|\n\\)*\\$FlowBug
+esproposal.class_static_fields=enable
+esproposal.class_instance_fields=enable
+esproposal.decorators=ignore
+traces=3
+
+[version]
+>=0.25.0
diff --git a/.gitignore b/.gitignore
index dbb9d4c83..e06c1bf7d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,6 @@ node_modules
 npm-debug.log
 .DS_Store
 dist
-lib
+lib/*
+!lib/index.js.flow
 coverage
diff --git a/lib/index.js.flow b/lib/index.js.flow
new file mode 100644
index 000000000..3041ab484
--- /dev/null
+++ b/lib/index.js.flow
@@ -0,0 +1,77 @@
+/* @flow */
+type ConnectAll = <D, P, S, C: React$Component<D, P, S>, SP, DP, Dispatch: Function>(
+  mapStateToProps: (state: Object) => SP,
+  mapDispatchToProps: (dispatch: Dispatch) => DP,
+  mergeProps: null | void,
+  options?: {pure?: boolean, withRef?: boolean}
+) => (component: Class<C>) => Class<React$Component<D, $Diff<$Diff<P, DP>, SP>, S>>
+
+type ConnectAllStateless = <P, SP, DP, Dispatch: Function>(
+  mapStateToProps: (state: Object) => SP,
+  mapDispatchToProps: (dispatch: Dispatch) => DP,
+  mergeProps: null | void,
+  options?: {pure?: boolean, withRef?: boolean}
+) => (component: (props: P) => any) => Class<React$Component<void, $Diff<$Diff<P, DP>, SP>, void>>
+
+type ConnectMerged = <D, P, S, C: React$Component<D, P, S>, SP, DP, MP, Dispatch: Function>(
+  mapStateToProps: (state: Object) => SP,
+  mapDispatchToProps: (dispatch: Dispatch) => DP,
+  mergeProps: (stateProps: SP, dispatchProps: DP, origProps: P) => MP,
+  options?: {pure?: boolean, withRef?: boolean}
+) => (component: Class<C>) => Class<React$Component<D, $Diff<P, MP>, S>>
+
+type ConnectMergedStateless = <P, SP, DP, MP, Dispatch: Function>(
+  mapStateToProps: (state: Object) => SP,
+  mapDispatchToProps: (dispatch: Dispatch) => DP,
+  mergeProps: (stateProps: SP, dispatchProps: DP, origProps: P) => MP,
+  options?: {pure?: boolean, withRef?: boolean}
+) => (component: (props: P) => any) => Class<React$Component<void, $Diff<P, MP>, void>>
+
+type ConnectNoState = <D, P, S, C: React$Component<D, P, S>, DP, Dispatch: Function>(
+    mapStateToProps: null | void,
+    mapDispatchToProps: (dispatch: Dispatch) => DP,
+    mergeProps: null | void,
+    options?: {pure?: boolean, withRef?: boolean}
+  ) => (component: Class<C>) => Class<React$Component<D, $Diff<P, DP>, S>>
+
+type ConnectNoStateStatless = <P, DP, Dispatch: Function>(
+    mapStateToProps: null | void,
+    mapDispatchToProps: (dispatch: Dispatch) => DP,
+    mergeProps: null | void,
+    options?: {pure?: boolean, withRef?: boolean}
+  ) => (component: (props: P) => any) => Class<React$Component<void, $Diff<P, DP>, void>>
+
+type ConnectDispatch = <D, P, S, C: React$Component<D, P, S>, SP, Dispatch: Function>(
+  mapStateToProps: (state: Object) => SP,
+  mapDispatchToProps: null | void,
+  mergeProps: null | void,
+  options?: {pure?: boolean, withRef?: boolean}
+) => (component: Class<C>) => Class<React$Component<D, $Diff<$Diff<P, {dispatch: Dispatch}>, SP>, S>>
+
+type ConnectDispatchStateless = <P, SP, Dispatch: Function>(
+  mapStateToProps: (state: Object) => SP,
+  mapDispatchToProps: null | void,
+  mergeProps: null | void,
+  options?: {pure?: boolean, withRef?: boolean}
+) => (component: (props: P) => any) => Class<React$Component<void, $Diff<$Diff<P, {dispatch: Dispatch}>, SP>, void>>
+
+type ConnectDefault = <D, P, S, C: React$Component<D, P, S>, Dispatch: Function>() =>
+  (component: Class<C>) => Class<React$Component<D, $Diff<P, {dispatch: Dispatch}>, S>>
+
+type ConnectDefaultStateless = () =>
+  <P>(component: (props: P) => any) => Class<React$Component<void, $Diff<P, {dispatch: Function}>, void>>
+
+declare export var connect
+    : ConnectAll
+    & ConnectAllStateless
+    & ConnectMerged
+    & ConnectMergedStateless
+    & ConnectNoState
+    & ConnectNoStateStatless
+    & ConnectDispatch
+    & ConnectDispatchStateless
+    & ConnectDefault
+    & ConnectDefaultStateless;
+declare export var Provider: ReactClass<{store: Object, children?: any}>;
+
+export {connect, Provider}