diff --git a/types/react-facebook-login/index.d.ts b/types/react-facebook-login/index.d.ts
index 9f83d7ae8b..b5bfebac5d 100644
--- a/types/react-facebook-login/index.d.ts
+++ b/types/react-facebook-login/index.d.ts
@@ -1,48 +1,47 @@
-// Type definitions for react-facebook-login 3.4
+// Type definitions for react-facebook-login 3.6
 // Project: https://github.com/keppelen/react-facebook-login
-// Definitions by: Alexandre Paré <https://github.com/apare>
+// Definitions by: Alexandre Paré <https://github.com/apare>, Jan Karres <https://github.com/jankarres>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
 
 import * as React from "react";
 
-declare namespace ReactFacebookLogin {
-    interface ReactFacebookLoginProps {
-        appId: string;
-        callback(userInfo: ReactFacebookLoginInfo): void;
+interface ReactFacebookLoginProps {
+    appId: string;
+    callback(userInfo: ReactFacebookLoginInfo): void;
 
-        autoLoad?: boolean;
-        buttonStyle?: React.CSSProperties;
-        containerStyle?: React.CSSProperties;
-        cookie?: boolean;
-        cssClass?: string;
-        disableMobileRedirect?: boolean;
-        fields?: string;
-        icon?: string | React.ReactNode;
-        isDisabled?: boolean;
-        language?: string;
-        onClick?(): void;
-        reAuthenticate?: boolean;
-        redirectUri?: string;
-        scope?: string;
-        size?: "small" | "medium" | "metro";
-        textButton?: string;
-        typeButton?: string;
-        version?: string;
-        xfbml?: boolean;
-    }
-
-    interface ReactFacebookLoginInfo {
-        id: string;
-        name: string;
-    }
-
-    interface ReactFacebookLoginState {
-        isSdkLoaded?: boolean;
-        isProcessing?: boolean;
-    }
+    autoLoad?: boolean;
+    buttonStyle?: React.CSSProperties;
+    containerStyle?: React.CSSProperties;
+    cookie?: boolean;
+    cssClass?: string;
+    disableMobileRedirect?: boolean;
+    fields?: string;
+    icon?: string | React.ReactNode;
+    isDisabled?: boolean;
+    language?: string;
+    onClick?(): void;
+    reAuthenticate?: boolean;
+    redirectUri?: string;
+    scope?: string;
+    size?: "small" | "medium" | "metro";
+    textButton?: string;
+    typeButton?: string;
+    version?: string;
+    xfbml?: boolean;
+    isMobile?: boolean;
+    tag?: Node | React.Component<any, any>;
 }
 
-declare class ReactFacebookLogin extends React.Component<ReactFacebookLogin.ReactFacebookLoginProps, ReactFacebookLogin.ReactFacebookLoginState> {}
+export interface ReactFacebookLoginInfo {
+    id: string;
+    name: string;
+}
 
-export = ReactFacebookLogin;
+interface ReactFacebookLoginState {
+    isSdkLoaded?: boolean;
+    isProcessing?: boolean;
+}
+
+declare class ReactFacebookLogin extends React.Component<ReactFacebookLoginProps, ReactFacebookLoginState> { }
+
+export default ReactFacebookLogin;