diff --git a/react-spinkit/index.d.ts b/react-spinkit/index.d.ts
index 9a14db213a..05955e3f53 100644
--- a/react-spinkit/index.d.ts
+++ b/react-spinkit/index.d.ts
@@ -1,18 +1,19 @@
 // Type definitions for react-spinkit 1.1.4
 // Project: https://github.com/KyleAMathews/react-spinkit
-// Definitions by: Qubo <https://github.com/tkqubo>
+// Definitions by: Qubo <https://github.com/tkqubo>, Mleko <https://github.com/mleko>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
 /// <reference types="react" />
 
+declare namespace spinner {
+	export interface SpinnerProps {
+		spinnerName?: string;
+	}
 
-import { Component } from 'react';
-
-interface Props {
-    spinnerName?: string;
+	export interface Spinner extends React.ComponentClass<SpinnerProps> {
+	}
 }
 
-declare class Spinner extends Component<Props, {}> { }
-
-export default Spinner;
+declare const spinner: spinner.Spinner;
+export = spinner;
diff --git a/react-spinkit/react-spinkit-tests.tsx b/react-spinkit/react-spinkit-tests.tsx
index e8467a95da..a163400601 100644
--- a/react-spinkit/react-spinkit-tests.tsx
+++ b/react-spinkit/react-spinkit-tests.tsx
@@ -1,7 +1,7 @@
 
 /// <reference types="react" />
 
-import Spinner from 'react-spinkit';
+import * as Spinner from 'react-spinkit';
 import * as React from 'react';
 
 let spinner = <Spinner spinnerName='double-bounce' />;