diff --git a/packages/patternfly-4/react-core/src/components/Avatar/Avatar.d.ts b/packages/patternfly-4/react-core/src/components/Avatar/Avatar.d.ts
new file mode 100644
index 00000000000..1e5cb02a9f0
--- /dev/null
+++ b/packages/patternfly-4/react-core/src/components/Avatar/Avatar.d.ts
@@ -0,0 +1,9 @@
+import { SFC, HTMLProps, ReactNode } from 'react';
+import { Omit } from '../../typeUtils';
+
+export interface AvatarProps extends HTMLProps<HTMLImageElement> {
+  src?: string;
+  alt: string;
+}
+declare const Avatar: SFC<AvatarProps>;
+export default Avatar;
\ No newline at end of file
diff --git a/packages/patternfly-4/react-core/src/components/Avatar/index.d.ts b/packages/patternfly-4/react-core/src/components/Avatar/index.d.ts
new file mode 100644
index 00000000000..902623c5fdc
--- /dev/null
+++ b/packages/patternfly-4/react-core/src/components/Avatar/index.d.ts
@@ -0,0 +1 @@
+export { default as Avatar, AvatarProps } from './Avatar';
\ No newline at end of file
diff --git a/packages/patternfly-4/react-core/src/components/index.ts b/packages/patternfly-4/react-core/src/components/index.d.ts
similarity index 97%
rename from packages/patternfly-4/react-core/src/components/index.ts
rename to packages/patternfly-4/react-core/src/components/index.d.ts
index 66f0aebcfbb..fee0e9a952a 100644
--- a/packages/patternfly-4/react-core/src/components/index.ts
+++ b/packages/patternfly-4/react-core/src/components/index.d.ts
@@ -15,11 +15,11 @@ export * from './Dropdown';
 export * from './EmptyState';
 export * from './Form';
 export * from './Label';
-export * from './Page';
 export * from './List';
 export * from './LoginPage';
 export * from './Modal';
 export * from './Nav';
+export * from './Page';
 // export * from './Popover'; // Not ready yet
 export * from './Progress';
 export * from './Radio';
@@ -28,4 +28,4 @@ export * from './Switch';
 export * from './TextArea';
 export * from './TextInput';
 export * from './Title';
-export * from './Text';
\ No newline at end of file
+export * from './Text';
diff --git a/packages/patternfly-4/react-core/src/components/index.js b/packages/patternfly-4/react-core/src/components/index.js
new file mode 100644
index 00000000000..59d922cf415
--- /dev/null
+++ b/packages/patternfly-4/react-core/src/components/index.js
@@ -0,0 +1,31 @@
+/** Keep alphabetically sorted */
+export * from './AboutModal';
+export * from './Alert';
+export * from './Avatar';
+export * from './Backdrop';
+export * from './BackgroundImage';
+export * from './Badge';
+export * from './Brand';
+export * from './Breadcrumb';
+export * from './Button';
+export * from './Card';
+export * from './Checkbox';
+export * from './DataList';
+export * from './Dropdown';
+export * from './EmptyState';
+export * from './Form';
+export * from './Label';
+export * from './List';
+export * from './LoginPage';
+export * from './Modal';
+export * from './Nav';
+// export * from './Popover'; // Not ready yet
+export * from './Page';
+export * from './Progress';
+export * from './Radio';
+export * from './Select';
+export * from './Switch';
+export * from './TextArea';
+export * from './TextInput';
+export * from './Title';
+export * from './Text';