diff --git a/types/react-router-dom/index.d.ts b/types/react-router-dom/index.d.ts
index 6cb00d15eb..c6025b5113 100644
--- a/types/react-router-dom/index.d.ts
+++ b/types/react-router-dom/index.d.ts
@@ -9,7 +9,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
-import { match } from "react-router";
+import { match } from 'react-router';
 import * as React from 'react';
 import * as H from 'history';
 
@@ -39,7 +39,7 @@ export {
 
 export interface BrowserRouterProps {
     basename?: string;
-    getUserConfirmation?: ((message: string, callback: (ok: boolean) => void) => void);
+    getUserConfirmation?: (message: string, callback: (ok: boolean) => void) => void;
     forceRefresh?: boolean;
     keyLength?: number;
 }
@@ -47,7 +47,7 @@ export class BrowserRouter extends React.Component<BrowserRouterProps, any> {}
 
 export interface HashRouterProps {
     basename?: string;
-    getUserConfirmation?: ((message: string, callback: (ok: boolean) => void) => void);
+    getUserConfirmation?: (message: string, callback: (ok: boolean) => void) => void;
     hashType?: 'slash' | 'noslash' | 'hashbang';
 }
 export class HashRouter extends React.Component<HashRouterProps, any> {}
@@ -58,23 +58,28 @@ export interface LinkProps<S = H.LocationState> extends React.AnchorHTMLAttribut
     replace?: boolean;
     innerRef?: React.Ref<HTMLAnchorElement>;
 }
-export class Link<S = H.LocationState> extends React.Component<
-  LinkProps<S>,
-  any
-> {}
+export function Link<S = H.LocationState>(
+    // TODO: Define this as ...params: Parameters<Link<S>> when only TypeScript >= 3.1 support is needed.
+    props: React.PropsWithoutRef<LinkProps<S>> & React.RefAttributes<HTMLAnchorElement>,
+): ReturnType<Link<S>>;
+export interface Link<S = H.LocationState>
+    extends React.ForwardRefExoticComponent<
+        React.PropsWithoutRef<LinkProps<S>> & React.RefAttributes<HTMLAnchorElement>
+    > {}
 
 export interface NavLinkProps<S = H.LocationState> extends LinkProps<S> {
-  activeClassName?: string;
-  activeStyle?: React.CSSProperties;
-  exact?: boolean;
-  strict?: boolean;
-  isActive?<Params extends { [K in keyof Params]?: string }>(
-    match: match<Params>,
-    location: H.Location<S>,
-  ): boolean;
-  location?: H.Location<S>;
+    activeClassName?: string;
+    activeStyle?: React.CSSProperties;
+    exact?: boolean;
+    strict?: boolean;
+    isActive?<Params extends { [K in keyof Params]?: string }>(match: match<Params>, location: H.Location<S>): boolean;
+    location?: H.Location<S>;
 }
-export class NavLink<S = H.LocationState> extends React.Component<
-  NavLinkProps<S>,
-  any
-> {}
+export function NavLink<S = H.LocationState>(
+    // TODO: Define this as ...params: Parameters<NavLink<S>> when only TypeScript >= 3.1 support is needed.
+    props: React.PropsWithoutRef<NavLinkProps<S>> & React.RefAttributes<HTMLAnchorElement>,
+): ReturnType<NavLink<S>>;
+export interface NavLink<S = H.LocationState>
+    extends React.ForwardRefExoticComponent<
+        React.PropsWithoutRef<NavLinkProps<S>> & React.RefAttributes<HTMLAnchorElement>
+    > {}
diff --git a/types/react-router-dom/react-router-dom-tests.tsx b/types/react-router-dom/react-router-dom-tests.tsx
index 0fefcbb195..e55739292e 100644
--- a/types/react-router-dom/react-router-dom-tests.tsx
+++ b/types/react-router-dom/react-router-dom-tests.tsx
@@ -5,19 +5,17 @@ import * as H from 'history';
 const getIsActive = (extraProp: string) => (match: match, location: H.Location) => !!extraProp;
 
 interface Props extends NavLinkProps {
-  extraProp: string;
+    extraProp: string;
 }
 
 export default function(props: Props) {
-  const {extraProp, ...rest} = props;
-  const isActive = getIsActive(extraProp);
-  return (
-    <NavLink {...rest} isActive={isActive}/>
-  );
+    const { extraProp, ...rest } = props;
+    const isActive = getIsActive(extraProp);
+    return <NavLink {...rest} isActive={isActive} />;
 }
 
 type OtherProps = RouteComponentProps<{
-  id: string;
+    id: string;
 }>;
 
 const Component: React.FC<OtherProps> = props => {
@@ -39,7 +37,20 @@ const MyLink: React.FC<LinkProps> = props => <Link style={{ color: 'red' }} {...
 
 const refCallback: React.Ref<HTMLAnchorElement> = node => {};
 <Link to="/url" replace={true} innerRef={refCallback} />;
+<Link to="/url" replace={true} ref={refCallback} />;
+<NavLink to="/url" replace={true} innerRef={refCallback} />;
+<NavLink to="/url" replace={true} ref={refCallback} />;
 const ref = React.createRef<HTMLAnchorElement>();
 <Link to="/url" replace={true} innerRef={ref} />;
+<Link to="/url" replace={true} ref={ref} />;
+<NavLink to="/url" replace={true} innerRef={ref} />;
+<NavLink to="/url" replace={true} ref={ref} />;
 
 <Link to="/url" aria-current="page" />;
+
+React.createElement<LinkProps<{ foo: number }> & React.RefAttributes<HTMLAnchorElement>>(Link, {
+    to: { pathname: 'abc', state: { foo: 5 } },
+});
+React.createElement<NavLinkProps<{ foo: number }> & React.RefAttributes<HTMLAnchorElement>>(NavLink, {
+    to: { pathname: 'abc', state: { foo: 5 } },
+});